diff --git a/Android.mk b/Android.mk
index e492f4a640f..9a86bdb26f1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -208,6 +208,7 @@ else
   LOCAL_MIN_SDK_VERSION := 26
 endif
 LOCAL_PACKAGE_NAME := TrebuchetQuickStep
+LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PRODUCT_MODULE := true
 LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 43c08c3cd24..5aa34b8225d 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -47,6 +47,8 @@
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
 
 
+    <uses-permission android:name="android.permission.DEVICE_POWER" />
+    
     <!--
     Permissions required for read/write access to the workspace data. These permission name
     should not conflict with that defined in other apps, as such an app should embed its package
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 425fb139906..be1b8c112cc 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
@@ -206,7 +206,7 @@ protected void onDraw(Canvas canvas) {
     private Layout getAllAppsLabelLayout() {
         if (mAllAppsLabelLayout == null) {
             mPaint.setAntiAlias(true);
-            mPaint.setTypeface(Typeface.create("sans-serif-medium", Typeface.NORMAL));
+            mPaint.setTypeface(Typeface.create("@*android:string/config_headlineFontFamilyMedium", Typeface.NORMAL));
             mPaint.setTextSize(
                     getResources().getDimensionPixelSize(R.dimen.all_apps_label_text_size));
 
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 07d079664aa..4d866470fea 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
@@ -58,18 +58,6 @@ 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) {
@@ -86,14 +74,10 @@ public void onScaleUpdate(float 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);
@@ -103,14 +87,11 @@ public TaskMenuView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
 
         mActivity = BaseDraggingActivity.fromContext(context);
-        mThumbnailTopMargin = getResources().getDimension(R.dimen.task_thumbnail_top_margin);
     }
 
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        mTaskName = findViewById(R.id.task_name);
-        mTaskIcon = findViewById(R.id.task_icon);
         mOptionLayout = findViewById(R.id.menu_option_layout);
     }
 
@@ -141,15 +122,6 @@ public void logActionCommand(int command) {
         // TODO
     }
 
-    @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;
@@ -157,7 +129,7 @@ protected boolean isOfType(int type) {
 
     public void setPosition(float x, float y) {
         setX(x);
-        setY(y + mThumbnailTopMargin);
+        setY(y);
     }
 
     public static TaskMenuView showForTask(TaskView taskView) {
@@ -180,23 +152,6 @@ private boolean populateAndShowForTask(TaskView taskView) {
     }
 
     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);
-
         final BaseDraggingActivity activity = BaseDraggingActivity.fromContext(getContext());
         final List<TaskSystemShortcut> shortcuts =
                 TaskOverlayFactory.INSTANCE.get(getContext()).getEnabledShortcuts(taskView);
@@ -221,12 +176,11 @@ private void orientAroundTaskView(TaskView taskView) {
         mActivity.getDragLayer().getDescendantRectRelativeToSelf(taskView, sTempRect);
         Rect insets = mActivity.getDragLayer().getInsets();
         BaseDragLayer.LayoutParams params = (BaseDragLayer.LayoutParams) getLayoutParams();
-        params.width = taskView.getMeasuredWidth();
-        params.gravity = Gravity.START;
+        params.gravity = Gravity.END;
         setLayoutParams(params);
         setScaleX(taskView.getScaleX());
         setScaleY(taskView.getScaleY());
-        setPosition(sTempRect.left - insets.left, sTempRect.top - insets.top);
+        setY(sTempRect.top - insets.top);
     }
 
     private void animateOpen() {
@@ -274,9 +228,10 @@ private void closeComplete() {
     }
 
     private RoundedRectRevealOutlineProvider createOpenCloseOutlineProvider() {
+        final int width = getWidth();
         float radius = Themes.getDialogCornerRadius(getContext());
-        Rect fromRect = new Rect(0, 0, getWidth(), 0);
-        Rect toRect = new Rect(0, 0, getWidth(), getHeight());
+        Rect fromRect = new Rect(width, 0, width, 0);
+        Rect toRect = new Rect(0, 0, width, getHeight());
         return new RoundedRectRevealOutlineProvider(radius, radius, fromRect, toRect);
     }
 
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 51802dffd2e..6d816619ce6 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
@@ -44,7 +44,9 @@
 import android.view.View;
 import android.view.ViewOutlineProvider;
 import android.view.accessibility.AccessibilityNodeInfo;
-import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.launcher3.BaseDraggingActivity;
@@ -80,7 +82,7 @@
 /**
  * A task in the Recents view.
  */
-public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
+public class TaskView extends LinearLayout implements PageCallbacks, Reusable {
 
     private static final String TAG = TaskView.class.getSimpleName();
 
@@ -151,7 +153,10 @@ public void onViewDetachedFromWindow(View view) {
     private Task mTask;
     private TaskThumbnailView mSnapshotView;
     private TaskMenuView mMenuView;
+    private View mTaskInfoContainer;
     private IconView mIconView;
+    private TextView mNameView;
+    private ImageView mMenuIconView;
     private final DigitalWellBeingToast mDigitalWellBeingToast;
     private float mCurveScale;
     private float mFullscreenProgress;
@@ -223,7 +228,10 @@ Touch.TAP, Direction.NONE, getRecentsView().indexOfChild(this),
     protected void onFinishInflate() {
         super.onFinishInflate();
         mSnapshotView = findViewById(R.id.snapshot);
+        mTaskInfoContainer = findViewById(R.id.task_info_container);
         mIconView = findViewById(R.id.icon);
+        mNameView = findViewById(R.id.name);
+        mMenuIconView = findViewById(R.id.menu);
     }
 
     public TaskMenuView getMenuView() {
@@ -350,6 +358,8 @@ public void onTaskListVisibilityChanged(boolean visible) {
             mIconLoadRequest = iconCache.updateIconInBackground(mTask,
                     (task) -> {
                         setIcon(task.icon);
+                        setName(task);
+                        setMenu(true);
                         if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
                             getRecentsView().updateLiveTileIcon(task.icon);
                         }
@@ -358,6 +368,8 @@ public void onTaskListVisibilityChanged(boolean visible) {
         } else {
             mSnapshotView.setThumbnail(null, null);
             setIcon(null);
+            setName(null);
+            setMenu(false);
             // Reset the task thumbnail reference as well (it will be fetched from the cache or
             // reloaded next time we need it)
             mTask.thumbnail = null;
@@ -387,17 +399,24 @@ private boolean showTaskMenu(int action) {
     }
 
     private void setIcon(Drawable icon) {
-        if (icon != null) {
-            mIconView.setDrawable(icon);
-            mIconView.setOnClickListener(v -> showTaskMenu(Touch.TAP));
-            mIconView.setOnLongClickListener(v -> {
+        mIconView.setDrawable(icon);
+    }
+
+    private void setName(Task task) {
+        mNameView.setText(task == null ?
+                "" : TaskUtils.getTitle(getContext(), task));
+    }
+
+    private void setMenu(boolean enable) {
+        if (enable) {
+            mMenuIconView.setOnClickListener(v -> showTaskMenu(Touch.TAP));
+            mMenuIconView.setOnLongClickListener(v -> {
                 requestDisallowInterceptTouchEvent(true);
                 return showTaskMenu(Touch.LONGPRESS);
             });
         } else {
-            mIconView.setDrawable(null);
-            mIconView.setOnClickListener(null);
-            mIconView.setOnLongClickListener(null);
+            mMenuIconView.setOnClickListener(null);
+            mMenuIconView.setOnLongClickListener(null);
         }
     }
 
@@ -412,8 +431,7 @@ private void setIconAndDimTransitionProgress(float progress, boolean invert) {
         float upperClamp = invert ? 1 : iconScalePercentage;
         float scale = Interpolators.clampToProgress(FAST_OUT_SLOW_IN, lowerClamp, upperClamp)
                 .getInterpolation(progress);
-        mIconView.setScaleX(scale);
-        mIconView.setScaleY(scale);
+        mTaskInfoContainer.setAlpha(scale);
 
         mFooterVerticalOffset = 1.0f - scale;
         for (FooterWrapper footer : mFooters) {
@@ -499,7 +517,8 @@ public void onPageScroll(ScrollState scrollState) {
         }
 
         if (mMenuView != null) {
-            mMenuView.setPosition(getX() - getRecentsView().getScrollX(), getY());
+            mMenuView.setPosition(getX() - getRecentsView().getScrollX() +
+                    getWidth() - (int) mMenuView.getWidth(), getY());
             mMenuView.setScaleX(getScaleX());
             mMenuView.setScaleY(getScaleY());
         }
@@ -794,7 +813,7 @@ public void setFullscreenProgress(float progress) {
         }
         mFullscreenProgress = progress;
         boolean isFullscreen = mFullscreenProgress > 0;
-        mIconView.setVisibility(progress < 1 ? VISIBLE : INVISIBLE);
+        mTaskInfoContainer.setVisibility(progress < 1 ? VISIBLE : INVISIBLE);
         setClipChildren(!isFullscreen);
         setClipToPadding(!isFullscreen);
 
diff --git a/quickstep/res/drawable/ic_task_menu.xml b/quickstep/res/drawable/ic_task_menu.xml
new file mode 100644
index 00000000000..044889d4f92
--- /dev/null
+++ b/quickstep/res/drawable/ic_task_menu.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="?attr/workspaceTextColor">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" />
+</vector>
diff --git a/quickstep/res/drawable/task_menu_bg.xml b/quickstep/res/drawable/task_menu_bg.xml
index 7334d984f10..b625ab477ca 100644
--- a/quickstep/res/drawable/task_menu_bg.xml
+++ b/quickstep/res/drawable/task_menu_bg.xml
@@ -28,10 +28,10 @@
         <!-- Background -->
         <shape>
             <corners
-                android:topLeftRadius="?android:attr/dialogCornerRadius"
                 android:topRightRadius="?android:attr/dialogCornerRadius"
-                android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="0dp" />
+                android:topLeftRadius="?android:attr/dialogCornerRadius"
+                android:bottomLeftRadius="?android:attr/dialogCornerRadius"
+                android:bottomRightRadius="?android:attr/dialogCornerRadius" />
             <solid android:color="?attr/popupColorPrimary" />
         </shape>
     </item>
diff --git a/quickstep/res/layout/digital_wellbeing_toast.xml b/quickstep/res/layout/digital_wellbeing_toast.xml
index 83594e4ff33..b17b25d5b67 100644
--- a/quickstep/res/layout/digital_wellbeing_toast.xml
+++ b/quickstep/res/layout/digital_wellbeing_toast.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:background="@drawable/bg_wellbeing_toast"
-    android:fontFamily="sans-serif"
+    android:fontFamily="@*android:string/config_bodyFontFamily"
     android:forceHasOverlappingRendering="false"
     android:gravity="center"
     android:importantForAccessibility="noHideDescendants"
diff --git a/quickstep/res/layout/task.xml b/quickstep/res/layout/task.xml
index 60cfa0cbaa4..468aa9dd4a1 100644
--- a/quickstep/res/layout/task.xml
+++ b/quickstep/res/layout/task.xml
@@ -18,20 +18,55 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:defaultFocusHighlightEnabled="false"
-    android:elevation="4dp"
+    android:orientation="vertical"
     android:focusable="true">
 
+    <RelativeLayout
+        android:id="@+id/task_info_container"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/task_thumbnail_icon_size"
+        android:orientation="horizontal"
+        android:layout_marginBottom="8dp"
+        android:focusable="false">
+
+        <com.android.quickstep.views.IconView
+            android:id="@+id/icon"
+            android:layout_width="@dimen/task_thumbnail_icon_size"
+            android:layout_height="match_parent"
+            android:focusable="false"
+            android:layout_alignParentEnd="true"
+            android:importantForAccessibility="no"/>
+
+        <ImageView
+            android:id="@+id/menu"
+            android:layout_width="@dimen/task_thumbnail_icon_size"
+            android:layout_height="match_parent"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:padding="6dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:src="@drawable/ic_task_menu" />
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:layout_toStartOf="@id/icon"
+            android:layout_marginStart="@dimen/task_thumbnail_icon_size"
+            android:focusable="false"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textColor="?attr/workspaceTextColor"
+            android:textSize="16sp"/>
+    </RelativeLayout>
+
     <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:elevation="4dp" />
 
-    <com.android.quickstep.views.IconView
-        android:id="@+id/icon"
-        android:layout_width="@dimen/task_thumbnail_icon_size"
-        android:layout_height="@dimen/task_thumbnail_icon_size"
-        android:layout_gravity="top|center_horizontal"
-        android:focusable="false"
-        android:importantForAccessibility="no"/>
-</com.android.quickstep.views.TaskView>
\ No newline at end of file
+</com.android.quickstep.views.TaskView>
diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml
index 098b34fcbf4..d504b7f66c9 100644
--- a/quickstep/res/layout/task_menu.xml
+++ b/quickstep/res/layout/task_menu.xml
@@ -16,39 +16,19 @@
 -->
 <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"
-    android:paddingBottom="@dimen/task_card_menu_shadow_height"
+    android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
+    android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
     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"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:layout_marginBottom="16dp"
-        android:textSize="12sp"/>
-
     <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_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-</com.android.quickstep.views.TaskMenuView>
\ No newline at end of file
+</com.android.quickstep.views.TaskMenuView>
diff --git a/quickstep/res/layout/task_view_menu_option.xml b/quickstep/res/layout/task_view_menu_option.xml
index 102ae9bc233..0ecd50db1ae 100644
--- a/quickstep/res/layout/task_view_menu_option.xml
+++ b/quickstep/res/layout/task_view_menu_option.xml
@@ -18,10 +18,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/TaskMenu.Option"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:orientation="vertical"
+    android:layout_gravity="center_horizontal|start"
+    android:gravity="center"
+    android:orientation="horizontal"
     android:paddingTop="@dimen/task_card_menu_option_vertical_padding"
     android:paddingBottom="@dimen/task_card_menu_option_vertical_padding"
+    android:paddingStart="@dimen/task_card_menu_option_horizontal_padding"
+    android:paddingEnd="@dimen/task_card_menu_option_horizontal_padding"
     android:background="?android:attr/selectableItemBackground"
     android:theme="@style/PopupItem" >
 
@@ -29,22 +32,18 @@
       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_gravity="center_horizontal"
+      android:layout_margin="@dimen/deep_shortcut_drawable_padding"
       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:paddingEnd="@dimen/deep_shortcut_drawable_padding"
         android:textSize="12sp"
         android:textColor="?android:attr/textColorPrimary"
-        android:fontFamily="sans-serif"
-        android:gravity="center_horizontal"
-        android:layout_gravity="center_horizontal"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
         android:focusable="false" />
 
 </LinearLayout>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 78424ca5168..2c4a114f43f 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -16,9 +16,9 @@
 
 <resources>
 
-    <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_thumbnail_top_margin">44dp</dimen>
+    <dimen name="task_thumbnail_half_top_margin">22dp</dimen>
+    <dimen name="task_thumbnail_icon_size">36dp</dimen>
     <!-- For screens without rounded corners -->
     <dimen name="task_corner_radius_small">2dp</dimen>
 
@@ -53,6 +53,7 @@
          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_option_horizontal_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>
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index bb364ff6de7..ecf8c8db8a2 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -22,7 +22,7 @@
 
     <!-- Task Menu Option layout styles. -->
     <style name="TaskMenu.Option">
-        <item name="android:layout_width">match_parent</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
+</resources>
diff --git a/quickstep/src/com/android/quickstep/util/LayoutUtils.java b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
index 2e118b44dfd..a3bc2beac91 100644
--- a/quickstep/src/com/android/quickstep/util/LayoutUtils.java
+++ b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
@@ -105,6 +105,8 @@ public static void calculateTaskSize(Context context, DeviceProfile dp,
         }
 
         float topIconMargin = res.getDimension(R.dimen.task_thumbnail_top_margin);
+        // Add extra spacing for the icon + title
+        topIconMargin += res.getDimension(R.dimen.task_thumbnail_icon_size);
         float paddingVert = res.getDimension(R.dimen.task_card_vert_space);
 
         // Note this should be same as dp.availableWidthPx and dp.availableHeightPx unless
diff --git a/res/drawable/bg_all_apps_searchbox.xml b/res/drawable/bg_all_apps_searchbox.xml
index c3249279af2..ecfa9dc888e 100644
--- a/res/drawable/bg_all_apps_searchbox.xml
+++ b/res/drawable/bg_all_apps_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="?attr/popupColorPrimary" />
-    <corners android:radius="2dp" />
-</shape>
\ No newline at end of file
+    <solid android:color="@color/all_apps_bg_search" />
+    <corners android:radius="24.0dip" />
+</shape>
diff --git a/res/drawable/ic_app_info_icon_pack.xml b/res/drawable/ic_app_info_icon_pack.xml
new file mode 100644
index 00000000000..4a809b14ed0
--- /dev/null
+++ b/res/drawable/ic_app_info_icon_pack.xml
@@ -0,0 +1,15 @@
+<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/textColorPrimary">
+    <group
+        android:name="rotationGroup"
+        android:pivotX="12"
+        android:scaleX="-1">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM5.92,19H5v-0.92l9.06,-9.06 0.92,0.92L5.92,19zM20.71,5.63l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29s-0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41z"/>
+    </group>
+</vector>
diff --git a/res/drawable/ic_app_info_last_update.xml b/res/drawable/ic_app_info_last_update.xml
new file mode 100644
index 00000000000..bc51923d794
--- /dev/null
+++ b/res/drawable/ic_app_info_last_update.xml
@@ -0,0 +1,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/textColorPrimary">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M21,10.12h-6.78l2.74,-2.82c-2.73,-2.7 -7.15,-2.8 -9.88,-0.1 -2.73,2.71 -2.73,7.08 0,9.79 2.73,2.71 7.15,2.71 9.88,0C18.32,15.65 19,14.08 19,12.1h2c0,1.98 -0.88,4.55 -2.64,6.29 -3.51,3.48 -9.21,3.48 -12.72,0 -3.5,-3.47 -3.53,-9.11 -0.02,-12.58 3.51,-3.47 9.14,-3.47 12.65,0L21,3v7.12zM12.5,8v4.25l3.5,2.08 -0.72,1.21L11,13V8h1.5z" />
+</vector>
diff --git a/res/drawable/ic_app_info_source.xml b/res/drawable/ic_app_info_source.xml
new file mode 100644
index 00000000000..2aafd6068d7
--- /dev/null
+++ b/res/drawable/ic_app_info_source.xml
@@ -0,0 +1,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/textColorPrimary">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3L6,3c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5L3,19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM6.24,5h11.52l0.81,0.97L5.44,5.97l0.8,-0.97zM5,19L5,8h14v11L5,19zM13.45,10h-2.9v3L8,13l4,4 4,-4h-2.55z"/>
+</vector>
diff --git a/res/drawable/ic_app_info_version.xml b/res/drawable/ic_app_info_version.xml
new file mode 100644
index 00000000000..e3fd7bdf7ac
--- /dev/null
+++ b/res/drawable/ic_app_info_version.xml
@@ -0,0 +1,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/textColorPrimary">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15,9L9,9v6h6L15,9zM13,13h-2v-2h2v2zM21,11L21,9h-2L19,7c0,-1.1 -0.9,-2 -2,-2h-2L15,3h-2v2h-2L11,3L9,3v2L7,5c-1.1,0 -2,0.9 -2,2v2L3,9v2h2v2L3,13v2h2v2c0,1.1 0.9,2 2,2h2v2h2v-2h2v2h2v-2h2c1.1,0 2,-0.9 2,-2v-2h2v-2h-2v-2h2zM17,17L7,17L7,7h10v10z"/>
+</vector>
diff --git a/res/layout/all_apps_empty_search.xml b/res/layout/all_apps_empty_search.xml
index 463adac0c6e..d108fc764aa 100644
--- a/res/layout/all_apps_empty_search.xml
+++ b/res/layout/all_apps_empty_search.xml
@@ -23,7 +23,7 @@
     android:paddingBottom="8dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:fontFamily="sans-serif-medium"
+    android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
     android:textSize="14sp"
     android:textColor="?android:attr/textColorTertiary"
     android:focusable="false" />
diff --git a/res/layout/all_apps_search_market.xml b/res/layout/all_apps_search_market.xml
index 6f2dd3d21e1..a9d0df7d350 100644
--- a/res/layout/all_apps_search_market.xml
+++ b/res/layout/all_apps_search_market.xml
@@ -21,7 +21,7 @@
     android:gravity="center"
     android:paddingLeft="@dimen/dynamic_grid_edge_margin"
     android:paddingRight="@dimen/dynamic_grid_edge_margin"
-    android:fontFamily="sans-serif-medium"
+    android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
     android:textSize="14sp"
     android:textColor="?android:attr/colorAccent"
     android:text="@string/all_apps_search_market_message"
diff --git a/res/layout/app_info_bottom_sheet.xml b/res/layout/app_info_bottom_sheet.xml
new file mode 100644
index 00000000000..f3dd4f79370
--- /dev/null
+++ b/res/layout/app_info_bottom_sheet.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.android.launcher3.customization.InfoBottomSheet
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="28dp"
+    android:background="@drawable/top_round_rect_primary"
+    android:elevation="@dimen/deep_shortcuts_elevation"
+    android:layout_gravity="bottom"
+    android:theme="?attr/widgetsTheme">
+
+    <TextView
+        style="@style/TextHeadline"
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:fontFamily="@*android:string/config_headlineFontFamily"
+        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:paddingBottom="16dp"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
+        android:textColor="?android:attr/textColorTertiary"
+        android:textSize="14sp"
+        android:text="@string/app_info_subtext"/>
+
+    <fragment
+        android:id="@+id/sheet_prefs"
+        android:name="com.android.launcher3.customization.InfoBottomSheet$PrefsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="40dp" />
+
+</com.android.launcher3.customization.InfoBottomSheet>
\ No newline at end of file
diff --git a/res/layout/drop_target_tool_tip.xml b/res/layout/drop_target_tool_tip.xml
index a3efec4e312..3daedbb582b 100644
--- a/res/layout/drop_target_tool_tip.xml
+++ b/res/layout/drop_target_tool_tip.xml
@@ -27,5 +27,5 @@
     android:paddingStart="16dp"
     android:paddingTop="6.5dp"
     android:textSize="14sp"
-    android:fontFamily="sans-serif"
+    android:fontFamily="@*android:string/config_headlineFontFamily"
     android:textColor="?android:attr/colorForeground" />
diff --git a/res/layout/notification_content.xml b/res/layout/notification_content.xml
index d01be019eb5..8d05493a628 100644
--- a/res/layout/notification_content.xml
+++ b/res/layout/notification_content.xml
@@ -40,7 +40,7 @@
             android:layout_width="@dimen/notification_icon_size"
             android:layout_height="match_parent"
             android:layout_gravity="end"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
             android:gravity="center"
             android:textColor="?android:attr/textColorPrimary"
             android:textSize="@dimen/notification_header_count_text_size" />
@@ -69,7 +69,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:fontFamily="sans-serif"
+                android:fontFamily="@*android:string/config_headlineFontFamily"
                 android:lines="1"
                 android:textAlignment="viewStart"
                 android:textColor="?android:attr/textColorPrimary"
@@ -80,7 +80,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:fontFamily="sans-serif"
+                android:fontFamily="@*android:string/config_bodyFontFamily"
                 android:lines="1"
                 android:textColor="?android:attr/textColorSecondary"
                 android:textSize="@dimen/notification_main_text_size" />
diff --git a/res/layout/user_folder_icon_normalized.xml b/res/layout/user_folder_icon_normalized.xml
index a1033f06ce1..fb238fc64d4 100644
--- a/res/layout/user_folder_icon_normalized.xml
+++ b/res/layout/user_folder_icon_normalized.xml
@@ -48,7 +48,7 @@
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:background="@android:color/transparent"
-            android:fontFamily="sans-serif-condensed"
+            android:fontFamily="@*android:string/config_bodyFontFamily"
             android:textStyle="bold"
             android:gravity="center_horizontal"
             android:hint="@string/folder_hint_text"
diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index 3fdfc966675..3dea043fb85 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -39,7 +39,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:paddingTop="4dp"
-        android:fontFamily="sans-serif"
+        android:fontFamily="@*android:string/config_bodyFontFamily"
         android:textColor="?android:attr/textColorTertiary"
         android:textSize="14sp"
         android:text="@string/long_press_widget_to_add"/>
diff --git a/res/values-night-v26/colors.xml b/res/values-night-v26/colors.xml
new file mode 100644
index 00000000000..3ed1b1878b1
--- /dev/null
+++ b/res/values-night-v26/colors.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** Copyright 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>
+    <color name="omni_color2">@*android:color/primary_dark_device_default_settings</color>
+    <color name="omni_color1">@*android:color/primary_device_default_settings</color>
+    <color name="all_apps_bg_search">@color/omni_color1</color>
+</resources>
diff --git a/res/values-night-v26/styles.xml b/res/values-night-v26/styles.xml
index 510e1f4cd01..d033ca5af85 100644
--- a/res/values-night-v26/styles.xml
+++ b/res/values-night-v26/styles.xml
@@ -23,4 +23,37 @@
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
     </style>
 
-</resources>
\ No newline at end of file
+    <style name="WidgetContainerTheme.Dark" parent="AppTheme.Dark">
+        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
+        <item name="android:colorPrimary">@color/omni_color1</item>
+        <item name="android:colorPrimaryDark">@color/omni_color2</item>
+    </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:textColorHint">#A0FFFFFF</item>
+        <item name="android:colorControlHighlight">#A0FFFFFF</item>
+        <item name="android:colorPrimary">@color/omni_color1</item>
+        <item name="android:colorPrimaryDark">@color/omni_color2</item>
+        <item name="allAppsScrimColor">@color/omni_color2</item>
+        <item name="allAppsInterimScrimAlpha">102</item>
+        <item name="allAppsNavBarScrimColor">#80000000</item>
+        <item name="popupColorPrimary">@color/omni_color2</item>
+        <item name="popupColorSecondary">@color/omni_color1</item> 
+        <item name="popupColorTertiary">@color/omni_color1</item> <!-- Gray 600 -->
+        <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
+        <item name="folderDotColor">#FF464646</item>
+        <item name="folderFillColor">@color/omni_color2</item> <!-- 87% GM2 800 -->
+        <item name="folderIconBorderColor">#FF80868B</item>
+        <item name="folderTextColor">@android:color/white</item>
+        <item name="isMainColorDark">true</item>
+        <item name="loadingIconColor">#99FFFFFF</item>
+    </style>
+
+    <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">
+        <item name="folderFillColor">@color/omni_color2</item> <!-- 100% GM2 800 -->
+        <item name="folderTextColor">@android:color/white</item>
+    </style>
+</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index bb4834f69d0..243bab68928 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -34,7 +34,7 @@
     <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>
-    <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>
diff --git a/res/values-v26/styles.xml b/res/values-v26/styles.xml
index 8fb408b5842..2fa4fbbe435 100644
--- a/res/values-v26/styles.xml
+++ b/res/values-v26/styles.xml
@@ -22,9 +22,5 @@
         <item name="android:colorPrimaryDark">#E8EAED</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/colors.xml b/res/values/colors.xml
index 3c8fe1e2536..0ee15f01539 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,6 +35,8 @@
 
     <color name="icon_background">#E0E0E0</color> <!-- Gray 300 -->
 
+    <color name="all_apps_bg_search">@android:color/white</color>
+
     <color name="all_apps_bg_hand_fill">#E5E5E5</color>
     <color name="all_apps_bg_hand_fill_dark">#9AA0A6</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index b3e07e28f9c..56fd75ee6e1 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -69,7 +69,7 @@
     <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="system_shortcut_factory_class" translatable="false"></string>
+    <string name="system_shortcut_factory_class" translatable="false">com.android.launcher3.customization.ShadeShortcutFactory</string>
     <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>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d9b0f9a0b86..1a53832d334 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -38,7 +38,7 @@
 
     <!-- Hotseat/all-apps scrim -->
     <dimen name="all_apps_scrim_blur">4dp</dimen>
-    <dimen name="vertical_drag_handle_size">24dp</dimen>
+    <dimen name="vertical_drag_handle_size">20dp</dimen>
     <dimen name="vertical_drag_handle_overlap_workspace">0dp</dimen>
 
 <!-- Drop target bar -->
@@ -79,7 +79,7 @@
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
     <dimen name="all_apps_header_tab_height">50dp</dimen>
     <dimen name="all_apps_tabs_indicator_height">2dp</dimen>
-    <dimen name="all_apps_header_top_padding">36dp</dimen>
+    <dimen name="all_apps_header_top_padding">60dp</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>
diff --git a/res/values/lineage_strings.xml b/res/values/lineage_strings.xml
index 40200b4ef57..58d1448d820 100644
--- a/res/values/lineage_strings.xml
+++ b/res/values/lineage_strings.xml
@@ -60,4 +60,20 @@
     <string name="icon_pack_default_label">Default</string>
     <string name="icon_pack_add">Install more</string>
     <string name="icon_pack_no_market">There\'s no available app store</string>
+
+    <!-- DT2S -->
+    <string name="pref_sleep_gesture_title">Double tap to sleep</string>
+    <string name="pref_sleep_gesture_summary">Double tap on empty space for power-off</string>
+
+    <!-- AppInfo -->
+    <string name="app_info_subtext" translatable="false">Swipe down to close app info.</string>
+    <string name="app_info_version_value" translatable="false">%1$s (%2$d)</string>
+    <string name="placeholder_string" translatable="false">Loading...</string> <!-- Used for preference height loading. -->
+    <string name="app_info_icon_pack" translatable="false">Icon pack</string>
+    <string name="app_info_icon_pack_none" translatable="false">None</string>
+    <string name="app_info_source" translatable="false">Source</string>
+    <string name="app_info_source_unknown" translatable="false">Unknown</string>
+    <string name="app_info_last_update" translatable="false">Last update</string>
+    <string name="app_info_version" translatable="false">Version</string>
+    <string name="app_info_more" translatable="false">More</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 80c791c5891..41f2e8af777 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -48,7 +48,7 @@
         <item name="folderFillColor">#CDFFFFFF</item>
         <item name="folderIconBorderColor">?android:attr/colorPrimary</item>
         <item name="folderTextColor">#FF212121</item>
-        <item name="loadingIconColor">#CCFFFFFF</item>
+        <item name="loadingIconColor">#CCFFFFFF</item>f
 
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
@@ -58,7 +58,7 @@
     </style>
 
     <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme">
-        <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 -->
+        <item name="folderFillColor">@*android:color/primary_dark_material_settings</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
     </style>
 
@@ -86,12 +86,12 @@
         <item name="allAppsScrimColor">#EA212121</item>
         <item name="allAppsInterimScrimAlpha">102</item>
         <item name="allAppsNavBarScrimColor">#80000000</item>
-        <item name="popupColorPrimary">#3C4043</item> <!-- Gray 800 -->
-        <item name="popupColorSecondary">#5F6368</item> <!-- Gray 700 -->
-        <item name="popupColorTertiary">#757575</item> <!-- Gray 600 -->
+        <item name="popupColorPrimary">@*android:color/primary_dark_material_settings</item>
+        <item name="popupColorSecondary">@*android:color/secondary_material_settings</item>
+        <item name="popupColorTertiary">@*android:color/tertiary_material_settings</item>
         <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
         <item name="folderDotColor">#FF464646</item>
-        <item name="folderFillColor">#DD3C4043</item> <!-- 87% GM2 800 -->
+        <item name="folderFillColor">@*android:color/primary_dark_material_settings</item>
         <item name="folderIconBorderColor">#FF80868B</item>
         <item name="folderTextColor">@android:color/white</item>
         <item name="isMainColorDark">true</item>
@@ -106,7 +106,7 @@
     <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="folderFillColor">@*android:color/primary_dark_material_settings</item>
         <item name="folderTextColor">?attr/workspaceTextColor</item>
         <item name="workspaceTextColor">#FF212121</item>
         <item name="workspaceShadowColor">@android:color/transparent</item>
@@ -132,6 +132,8 @@
 
     <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="allowDividerAbove">false</item>
+        <item name="allowDividerBelow">false</item>
     </style>
 
     <!--
diff --git a/res/xml/app_info_preferences.xml b/res/xml/app_info_preferences.xml
new file mode 100644
index 00000000000..8af0e1ab989
--- /dev/null
+++ b/res/xml/app_info_preferences.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 Google Inc.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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.preference.PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <Preference
+        android:key="pref_app_info_version"
+        android:title="@string/app_info_version"
+        android:summary="@string/placeholder_string"
+        android:icon="@drawable/ic_app_info_version"
+        android:persistent="false" />
+
+    <Preference
+        android:key="pref_app_info_last_update"
+        android:title="@string/app_info_last_update"
+        android:summary="@string/placeholder_string"
+        android:icon="@drawable/ic_app_info_last_update"
+        android:persistent="false" />
+
+    <Preference
+        android:key="pref_app_info_source"
+        android:title="@string/app_info_source"
+        android:summary="@string/placeholder_string"
+        android:icon="@drawable/ic_app_info_source"
+        android:persistent="false" />
+
+    <Preference
+        android:key="pref_app_info_icon_pack"
+        android:title="@string/app_info_icon_pack"
+        android:summary="@string/placeholder_string"
+        android:icon="@drawable/ic_app_info_icon_pack"
+        android:persistent="false" />
+
+    <Preference
+        android:key="pref_app_info_more"
+        android:title="@string/app_info_more"
+        android:icon="@drawable/ic_info_no_shadow"
+        android:persistent="false" />
+
+</androidx.preference.PreferenceScreen>
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index 87ffb465ca4..b7c61055f0c 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -41,6 +41,13 @@
             android:title="@string/settings_edit_allow_title"
             android:summaryOn="@string/settings_edit_allow_summary_on"
             android:summaryOff="@string/settings_edit_allow_summary_off" />
+
+    <SwitchPreference
+        android:key="pref_sleep_gesture"
+        android:title="@string/pref_sleep_gesture_title"
+        android:summary="@string/pref_sleep_gesture_summary"
+        android:defaultValue="true"
+        android:persistent="true"/>
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 4a240ffb99f..3bae41336d3 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -235,11 +235,11 @@ public DeviceProfile(Context context, InvariantDeviceProfile inv,
             // Note: This calculation was created after noticing a pattern in the design spec.
             int extraSpace = getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2
                     - verticalDragHandleSizePx;
-            hotseatBarSizePx += extraSpace;
-            hotseatBarBottomPaddingPx += extraSpace;
+            //hotseatBarSizePx += extraSpace;
+            //hotseatBarBottomPaddingPx += extraSpace;
 
             // Recalculate the available dimensions using the new hotseat size.
-            updateAvailableDimensions(dm, res);
+            //updateAvailableDimensions(dm, res);
         }
 
         if (originalIDP != null) {
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 108898e992a..2fa6089818a 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -24,9 +24,15 @@
 import android.app.Person;
 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.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ShortcutInfo;
 import android.content.res.Resources;
@@ -52,6 +58,7 @@
 import android.text.style.TtsSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.Pair;
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
@@ -337,6 +344,69 @@ public static float mapRange(float value, float min, float max) {
         return min + (value * (max - min));
     }
 
+    public static boolean isSystemApp(Context context, String pkgName) {
+        return isSystemApp(context, null, pkgName);
+    }
+
+    public static boolean isSystemApp(Context context, Intent intent) {
+        return isSystemApp(context, intent, null);
+    }
+
+    public static boolean isSystemApp(Context context, Intent intent, String pkgName) {
+        PackageManager pm = context.getPackageManager();
+        String packageName = null;
+        // If the intent is not null, let's get the package name from the intent.
+        if (intent != null) {
+            ComponentName cn = intent.getComponent();
+            if (cn == null) {
+                ResolveInfo info = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+                if ((info != null) && (info.activityInfo != null)) {
+                    packageName = info.activityInfo.packageName;
+                }
+            } else {
+                packageName = cn.getPackageName();
+            }
+        }
+        // Otherwise we have the package name passed from the method.
+        else {
+            packageName = pkgName;
+        }
+        // Check if the provided package is a system app.
+        if (packageName != null) {
+            try {
+                PackageInfo info = pm.getPackageInfo(packageName, 0);
+                return (info != null) && (info.applicationInfo != null) &&
+                        ((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
+            } catch (NameNotFoundException e) {
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
+
+    /*
+     * Finds a system apk which had a broadcast receiver listening to a particular action.
+     * @param action intent action used to find the apk
+     * @return a pair of apk package name and the resources.
+     */
+    static Pair<String, Resources> findSystemApk(String action, PackageManager pm) {
+        final Intent intent = new Intent(action);
+        for (ResolveInfo info : pm.queryBroadcastReceivers(intent, 0)) {
+            if (info.activityInfo != null &&
+                    (info.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                final String packageName = info.activityInfo.packageName;
+                try {
+                    final Resources res = pm.getResourcesForApplication(packageName);
+                    return Pair.create(packageName, res);
+                } catch (NameNotFoundException e) {
+                    Log.w(TAG, "Failed to find resources for " + packageName);
+                }
+            }
+        }
+        return null;
+    }
+
     /**
      * Trims the string, removing all whitespace at the beginning and end of the string.
      * Non-breaking whitespaces are also removed.
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index bcfdf916bbc..627b2225fd5 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -20,6 +20,7 @@
 import static android.view.View.MeasureSpec.makeMeasureSpec;
 
 import static com.android.launcher3.LauncherState.ALL_APPS_HEADER;
+import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
 import static com.android.launcher3.Utilities.prefixTextWithIcon;
 import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
 
@@ -233,6 +234,9 @@ public float getScrollRangeDelta(Rect insets) {
     @Override
     public void setContentVisibility(int visibleElements, PropertySetter setter,
             Interpolator interpolator) {
-        setter.setViewAlpha(this, (visibleElements & ALL_APPS_HEADER) != 0 ? 1 : 0, interpolator);
+        boolean hasAllAppsHeaderExtra = mAppsView != null
+                    && mAppsView.getFloatingHeaderView().hasVisibleContent();
+        int headerElement = hasAllAppsHeaderExtra ? ALL_APPS_HEADER_EXTRA : ALL_APPS_HEADER;
+        setter.setViewAlpha(this, (visibleElements & headerElement) != 0 ? 1 : 0, interpolator);
     }
 }
diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java
index 65cf1216daf..82a2568db71 100644
--- a/src/com/android/launcher3/config/BaseFlags.java
+++ b/src/com/android/launcher3/config/BaseFlags.java
@@ -65,7 +65,7 @@ public static boolean showFlagTogglerUi(Context context) {
 
     // When enabled a promise icon is added to the home screen when install session is active.
     public static final TogglableFlag PROMISE_APPS_NEW_INSTALLS =
-            new TogglableFlag("PROMISE_APPS_NEW_INSTALLS", true,
+            new TogglableFlag("PROMISE_APPS_NEW_INSTALLS", false,
                     "Adds a promise icon to the home screen for new install sessions.");
 
     // Enable moving the QSB on the 0th screen of the workspace
diff --git a/src/com/android/launcher3/customization/InfoBottomSheet.java b/src/com/android/launcher3/customization/InfoBottomSheet.java
new file mode 100644
index 00000000000..050fe226cda
--- /dev/null
+++ b/src/com/android/launcher3/customization/InfoBottomSheet.java
@@ -0,0 +1,142 @@
+package com.android.launcher3.customization;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.Bundle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.widget.WidgetsBottomSheet;
+
+public class InfoBottomSheet extends WidgetsBottomSheet {
+    private final FragmentManager mFragmentManager;
+    private View.OnClickListener mOnAppInfoClick;
+
+    public InfoBottomSheet(Context context) {
+        this(context, null);
+    }
+
+    public InfoBottomSheet(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public InfoBottomSheet(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mFragmentManager = Launcher.getLauncher(context).getFragmentManager();
+    }
+
+    public void setOnAppInfoClick(View.OnClickListener onclick) {
+        mOnAppInfoClick = onclick;
+    }
+
+    @Override
+    public void populateAndShow(ItemInfo itemInfo) {
+        super.populateAndShow(itemInfo);
+        TextView title = findViewById(R.id.title);
+        title.setText(itemInfo.title);
+
+        // Use a proxy so we can update the reference at runtime.
+        View.OnClickListener l = v -> mOnAppInfoClick.onClick(v);
+
+        PrefsFragment fragment =
+                (PrefsFragment) mFragmentManager.findFragmentById(R.id.sheet_prefs);
+        fragment.loadForApp(itemInfo, l);
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        Fragment pf = mFragmentManager.findFragmentById(R.id.sheet_prefs);
+        if (pf != null) {
+            mFragmentManager.beginTransaction()
+                    .remove(pf)
+                    .commitAllowingStateLoss();
+        }
+        super.onDetachedFromWindow();
+    }
+
+    @Override
+    public void onWidgetsBound() {
+    }
+
+    public static class PrefsFragment extends PreferenceFragment
+            implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
+        private static final String KEY_ICON_PACK = "pref_app_info_icon_pack";
+        private static final String KEY_SOURCE = "pref_app_info_source";
+        private static final String KEY_LAST_UPDATE = "pref_app_info_last_update";
+        private static final String KEY_VERSION = "pref_app_info_version";
+        private static final String KEY_MORE = "pref_app_info_more";
+
+        private Context mContext;
+
+        private ComponentName mComponent;
+        private ComponentKey mKey;
+        private View.OnClickListener mOnMoreClick;
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mContext = getActivity();
+        }
+
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+            addPreferencesFromResource(R.xml.app_info_preferences);
+        }
+
+        @Override
+        public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
+                                                 Bundle savedInstanceState) {
+            RecyclerView view = super.onCreateRecyclerView(inflater, parent, savedInstanceState);
+            view.setOverScrollMode(View.OVER_SCROLL_NEVER);
+            return view;
+        }
+
+        public void loadForApp(ItemInfo itemInfo, final View.OnClickListener onMoreClick) {
+            mComponent = itemInfo.getTargetComponent();
+            mKey = new ComponentKey(mComponent, itemInfo.user);
+            mOnMoreClick = onMoreClick;
+
+            MetadataExtractor extractor = new MetadataExtractor(mContext, mComponent);
+
+            Preference iconPack = findPreference(KEY_ICON_PACK);
+            iconPack.setOnPreferenceChangeListener(this);
+            iconPack.setSummary(R.string.app_info_icon_pack_none);
+            findPreference(KEY_SOURCE).setSummary(extractor.getSource());
+            findPreference(KEY_LAST_UPDATE).setSummary(extractor.getLastUpdate());
+            findPreference(KEY_VERSION).setSummary(mContext.getString(
+                    R.string.app_info_version_value,
+                    extractor.getVersionName(),
+                    extractor.getVersionCode()));
+            findPreference(KEY_MORE).setOnPreferenceClickListener(this);
+        }
+
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object newValue) {
+            if (KEY_ICON_PACK.equals(preference.getKey())) {
+                // Reload in launcher.
+            }
+            return false;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            if (KEY_MORE.equals(preference.getKey())) {
+                mOnMoreClick.onClick(getView());
+            }
+            return false;
+        }
+    }
+}
diff --git a/src/com/android/launcher3/customization/MetadataExtractor.java b/src/com/android/launcher3/customization/MetadataExtractor.java
new file mode 100644
index 00000000000..51c3260f455
--- /dev/null
+++ b/src/com/android/launcher3/customization/MetadataExtractor.java
@@ -0,0 +1,73 @@
+package com.android.launcher3.customization;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+
+import java.io.File;
+
+import static android.content.pm.PackageManager.GET_META_DATA;
+
+class MetadataExtractor {
+    private final Context mContext;
+    private final PackageManager mPm;
+
+    private String mSourcePkg = "";
+    private long mLastUpdate = 0;
+    private String mVersionName = "Unknown";
+    private long mVersionCode = 0;
+
+    MetadataExtractor(Context context, ComponentName cn) {
+        mContext = context;
+        mPm = context.getPackageManager();
+        String pkg = cn.getPackageName();
+
+        try {
+            mSourcePkg = mPm.getInstallerPackageName(pkg);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            PackageInfo pi = mPm.getPackageInfo(pkg, GET_META_DATA);
+            mLastUpdate = new File(pi.applicationInfo.sourceDir).lastModified();
+            mVersionName = pi.versionName;
+            mVersionCode = Utilities.ATLEAST_P ? pi.getLongVersionCode() : pi.versionCode;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    CharSequence getSource() {
+        if (TextUtils.isEmpty(mSourcePkg)) {
+            return mContext.getString(R.string.app_info_source_unknown);
+        }
+        try {
+            ApplicationInfo pi = mPm.getApplicationInfo(mSourcePkg, 0);
+            return pi.loadLabel(mPm);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return mSourcePkg;
+    }
+
+    String getLastUpdate() {
+        return DateUtils.formatDateTime(mContext, mLastUpdate,
+                DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_SHOW_DATE);
+    }
+
+    String getVersionName() {
+        return mVersionName;
+    }
+
+    long getVersionCode() {
+        return mVersionCode;
+    }
+}
diff --git a/src/com/android/launcher3/customization/ShadeShortcutFactory.java b/src/com/android/launcher3/customization/ShadeShortcutFactory.java
new file mode 100644
index 00000000000..aef8266ff23
--- /dev/null
+++ b/src/com/android/launcher3/customization/ShadeShortcutFactory.java
@@ -0,0 +1,45 @@
+package com.android.launcher3.customization;
+
+import android.content.Context;
+import android.view.View;
+
+import com.android.launcher3.BaseDraggingActivity;
+import com.android.launcher3.ItemInfo;
+import com.android.launcher3.Launcher;
+import com.android.launcher3.R;
+import com.android.launcher3.popup.SystemShortcut;
+import com.android.launcher3.popup.SystemShortcutFactory;
+
+@SuppressWarnings("unused")
+public class ShadeShortcutFactory extends SystemShortcutFactory {
+    public ShadeShortcutFactory(Context context) {
+        super(new BottomSheetShortcut(),
+                new SystemShortcut.Widgets(),
+                new SystemShortcut.Install());
+    }
+
+    public static class BottomSheetShortcut extends SystemShortcut.AppInfo {
+        @Override
+        public View.OnClickListener getOnClickListener(
+                BaseDraggingActivity activity, ItemInfo itemInfo) {
+            Launcher launcher = (Launcher) activity;
+            final View.OnClickListener aiListener = super.getOnClickListener(launcher, itemInfo);
+            return new View.OnClickListener() {
+                private InfoBottomSheet cbs;
+
+                @Override
+                public void onClick(View v) {
+                    if (cbs == null) {
+                        dismissTaskMenuView(launcher);
+                        cbs = (InfoBottomSheet) launcher.getLayoutInflater().inflate(
+                                R.layout.app_info_bottom_sheet,
+                                launcher.getDragLayer(),
+                                false);
+                        cbs.setOnAppInfoClick(aiListener);
+                        cbs.populateAndShow(itemInfo);
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index f66d07e3d8e..074238d4cdd 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -109,6 +109,7 @@ public class DragView extends View implements LauncherStateManager.StateListener
     private Path mScaledMaskPath;
     private Drawable mBadge;
     private ColorMatrixColorFilter mBaseFilter;
+    private boolean mShowSpringIcon;
 
     /**
      * Construct the drag view.
@@ -397,7 +398,7 @@ protected void onDraw(Canvas canvas) {
             }
         }
 
-        if (mScaledMaskPath != null) {
+        if (mScaledMaskPath != null && mShowSpringIcon) {
             int cnt = canvas.save();
             canvas.clipPath(mScaledMaskPath);
             mBgSpringDrawable.draw(canvas);
@@ -516,6 +517,9 @@ public void cancelAnimation() {
     public void move(int touchX, int touchY) {
         if (touchX > 0 && touchY > 0 && mLastTouchX > 0 && mLastTouchY > 0
                 && mScaledMaskPath != null) {
+            if (mLastTouchX != touchX || mLastTouchY != touchY) {
+                mShowSpringIcon = true;
+            }
             mTranslateX.animateToPos(mLastTouchX - touchX);
             mTranslateY.animateToPos(mLastTouchY - touchY);
         }
diff --git a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java b/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java
index 15ff207bd1c..cdd31f86dbc 100644
--- a/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java
+++ b/src/com/android/launcher3/graphics/WorkspaceAndHotseatScrim.java
@@ -255,7 +255,7 @@ private void reapplySysUiAlpha() {
     }
 
     private void reapplySysUiAlphaNoInvalidate() {
-        float factor = mSysUiProgress * mSysUiAnimMultiplier;
+        float factor = 0.0f;
         mBottomMaskPaint.setAlpha(Math.round(MAX_HOTSEAT_SCRIM_ALPHA * factor));
         if (mTopScrim != null) {
             mTopScrim.setAlpha(Math.round(255 * factor));
diff --git a/src/com/android/launcher3/notification/NotificationInfo.java b/src/com/android/launcher3/notification/NotificationInfo.java
index e5525b2faa7..c70f7cae5ea 100644
--- a/src/com/android/launcher3/notification/NotificationInfo.java
+++ b/src/com/android/launcher3/notification/NotificationInfo.java
@@ -20,6 +20,8 @@
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
@@ -76,9 +78,13 @@ public NotificationInfo(Context context, StatusBarNotification statusBarNotifica
             mIconColor = statusBarNotification.getNotification().color;
             mIsIconLarge = false;
         } else {
-            // Use the large icon.
-            mIconDrawable = icon.loadDrawable(context);
-            mIsIconLarge = true;
+            try {
+                String pkg = statusBarNotification.getPackageName();
+                Resources res = context.getPackageManager().getResourcesForApplication(pkg);
+                mIconDrawable = res.getDrawable(notification.icon);
+            } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
         }
         if (mIconDrawable == null) {
             mIconDrawable = new BitmapDrawable(context.getResources(), LauncherAppState
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index cad73eb0309..c8f9eb734b9 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -6,6 +6,7 @@
 import android.content.Intent;
 import android.graphics.Rect;
 import android.graphics.drawable.Icon;
+import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
 import android.view.View;
@@ -229,6 +230,40 @@ public View.OnClickListener getOnClickListener(Launcher activity, ItemInfo itemI
         }
     }
 
+    public static class Uninstall extends SystemShortcut {
+        public Uninstall() {
+            super(R.drawable.ic_uninstall_no_shadow, R.string.uninstall_drop_target_label);
+        }
+
+        @Override
+        public View.OnClickListener getOnClickListener(
+                BaseDraggingActivity activity, ItemInfo itemInfo) {
+            // Get application information.
+            String packageName = itemInfo.getTargetComponent().getPackageName();
+            boolean isSystemApp = Utilities.isSystemApp(activity.getApplicationContext(),
+                    packageName);
+            // Do not show the uninstall action if it's a system app.
+            if (isSystemApp) {
+                return null;
+            }
+            // Create uninstall action.
+            return createOnClickListener(activity, packageName);
+        }
+
+        private View.OnClickListener createOnClickListener(
+                BaseDraggingActivity activity, String packageName) {
+            return view -> {
+                // Dismiss drop down.
+                dismissTaskMenuView(activity);
+                // Send intent to uninstall package.
+                Intent intent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE);
+                intent.setData(Uri.parse("package:" + packageName));
+                intent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
+                activity.startActivity(intent);
+            };
+        }
+    }
+
     protected static void dismissTaskMenuView(BaseDraggingActivity activity) {
         AbstractFloatingView.closeOpenViews(activity, true,
             AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);
diff --git a/src/com/android/launcher3/popup/SystemShortcutFactory.java b/src/com/android/launcher3/popup/SystemShortcutFactory.java
index dfcc2f8224c..ce42ab6e9ba 100644
--- a/src/com/android/launcher3/popup/SystemShortcutFactory.java
+++ b/src/com/android/launcher3/popup/SystemShortcutFactory.java
@@ -41,6 +41,7 @@ public SystemShortcutFactory() {
         this(new SystemShortcut.AppInfo(),
                 new SystemShortcut.Widgets(),
                 new SystemShortcut.Install(),
+                new SystemShortcut.Uninstall(),
                 new SystemShortcut.DismissPrediction());
     }
 
diff --git a/src/com/android/launcher3/touch/WorkspaceTouchListener.java b/src/com/android/launcher3/touch/WorkspaceTouchListener.java
index 310d598b25c..7b250e7c842 100644
--- a/src/com/android/launcher3/touch/WorkspaceTouchListener.java
+++ b/src/com/android/launcher3/touch/WorkspaceTouchListener.java
@@ -23,8 +23,10 @@
 
 import static com.android.launcher3.LauncherState.NORMAL;
 
+import android.content.Context;
 import android.graphics.PointF;
 import android.graphics.Rect;
+import android.os.PowerManager;
 import android.view.GestureDetector;
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
@@ -37,6 +39,7 @@
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.Workspace;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.views.OptionsPopupView;
 import com.android.launcher3.userevent.nano.LauncherLogProto.Action;
@@ -59,6 +62,8 @@ public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListe
     private static final int STATE_PENDING_PARENT_INFORM = 2;
     private static final int STATE_COMPLETED = 3;
 
+    private static final String SLEEP_GESTURE = "pref_sleep_gesture";
+
     private final Rect mTempRect = new Rect();
     private final Launcher mLauncher;
     private final Workspace mWorkspace;
@@ -67,15 +72,21 @@ public class WorkspaceTouchListener extends GestureDetector.SimpleOnGestureListe
 
     private int mLongPressState = STATE_CANCELLED;
 
+    private final PowerManager mPm;
+
     private final GestureDetector mGestureDetector;
 
+    private final Context mContext;
+
     public WorkspaceTouchListener(Launcher launcher, Workspace workspace) {
         mLauncher = launcher;
         mWorkspace = workspace;
+        mContext = workspace.getContext();
         // Use twice the touch slop as we are looking for long press which is more
         // likely to cause movement.
         mTouchSlop = 2 * ViewConfiguration.get(launcher).getScaledTouchSlop();
-        mGestureDetector = new GestureDetector(workspace.getContext(), this);
+        mPm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        mGestureDetector = new GestureDetector(mContext, this);
     }
 
     @Override
@@ -181,4 +192,11 @@ public void onLongPress(MotionEvent event) {
             }
         }
     }
+
+    @Override
+    public boolean onDoubleTap(MotionEvent event) {
+        if (Utilities.getPrefs(mContext).getBoolean(SLEEP_GESTURE, true))
+            mPm.goToSleep(event.getEventTime());
+        return true;
+    }
 }
diff --git a/src/com/android/launcher3/util/PackageManagerHelper.java b/src/com/android/launcher3/util/PackageManagerHelper.java
index 78d1d3ca8fe..1ca28f82dc7 100644
--- a/src/com/android/launcher3/util/PackageManagerHelper.java
+++ b/src/com/android/launcher3/util/PackageManagerHelper.java
@@ -112,6 +112,11 @@ public static boolean isAppSuspended(ApplicationInfo info) {
      * any permissions
      */
     public boolean hasPermissionForActivity(Intent intent, String srcPackage) {
+        // b/270152142
+        if (Intent.ACTION_CHOOSER.equals(intent.getAction())) {
+            // Chooser shortcuts is not a valid target
+            return false;
+        }
         ResolveInfo target = mPm.resolveActivity(intent, 0);
         if (target == null) {
             // Not a valid target