diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index db9c232673b..08dbf7be85d 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -64,6 +64,12 @@
     <!-- AppLock -->
     <uses-permission android:name="com.android.permission.MANAGE_APP_LOCK" />
 
+    <!-- OmniWeather -->
+    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
+    <uses-permission android:name="org.omnirom.omnijaws.READ_WEATHER" />
+    <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" />
+    <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
+
     <!--
     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/privapp_whitelist_com.android.launcher3-ext.xml b/privapp_whitelist_com.android.launcher3-ext.xml
index 9a9138df939..778391bb628 100644
--- a/privapp_whitelist_com.android.launcher3-ext.xml
+++ b/privapp_whitelist_com.android.launcher3-ext.xml
@@ -22,5 +22,8 @@
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
         <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
+        <permission name="android.permission.GET_INTENT_SENDER_INTENT"/>
+        <permission name="com.android.alarm.permission.SET_ALARM"/>
     </privapp-permissions>
 </permissions>
diff --git a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java
index 7c30111c1f2..6b5b9f132f3 100644
--- a/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java
@@ -20,6 +20,7 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Outline;
@@ -37,6 +38,7 @@
 import com.android.launcher3.util.Executors;
 import com.android.launcher3.util.MultiPropertyFactory;
 import com.android.launcher3.util.MultiValueAlpha;
+import com.android.quickstep.NavHandle;
 import com.android.systemui.shared.navigationbar.RegionSamplingHelper;
 
 import java.io.PrintWriter;
@@ -44,7 +46,8 @@
 /**
  * Handles properties/data collection, then passes the results to our stashed handle View to render.
  */
-public class StashedHandleViewController implements TaskbarControllers.LoggableTaskbarController {
+public class StashedHandleViewController implements TaskbarControllers.LoggableTaskbarController,
+        NavHandle {
 
     public static final int ALPHA_INDEX_STASHED = 0;
     public static final int ALPHA_INDEX_HOME_DISABLED = 1;
@@ -302,4 +305,24 @@ public void dumpLogs(String prefix, PrintWriter pw) {
         pw.println(prefix + "\tmStashedHandleHeight=" + mStashedHandleHeight);
         mRegionSamplingHelper.dump(prefix, pw);
     }
+
+    @Override
+    public void animateNavBarLongPress(boolean isTouchDown, boolean shrink, long durationMs) {
+        // TODO(b/308693847): Animate similarly to NavigationHandle.java (SysUI).
+    }
+
+    @Override
+    public boolean isNavHandleStashedTaskbar() {
+        return true;
+    }
+
+    @Override
+    public boolean canNavHandleBeLongPressed() {
+        return isStashedHandleVisible();
+    }
+
+    @Override
+    public int getNavHandleWidth(Context context) {
+        return mStashedHandleWidth;
+    }
 }
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
index 4290948ad2a..f9d92a64902 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
@@ -120,6 +120,7 @@
 import com.android.launcher3.util.VibratorWrapper;
 import com.android.launcher3.util.ViewCache;
 import com.android.launcher3.views.ActivityContext;
+import com.android.quickstep.NavHandle;
 import com.android.quickstep.views.RecentsView;
 import com.android.quickstep.views.TaskView;
 import com.android.systemui.shared.recents.model.Task;
@@ -580,6 +581,11 @@ public BubbleControllers getBubbleControllers() {
         return mControllers.bubbleControllers.orElse(null);
     }
 
+    @NonNull
+    public NavHandle getNavHandle() {
+        return mControllers.stashedHandleViewController;
+    }
+
     @Override
     public ViewCache getViewCache() {
         return mViewCache;
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index 8efc7190cd8..af1cfde54a9 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -73,6 +73,8 @@
 import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider;
 import com.android.wm.shell.Flags;
 
+import android.provider.Settings;
+
 import java.io.PrintWriter;
 import java.util.StringJoiner;
 
@@ -105,6 +107,9 @@ public class TaskbarManager {
     private static final Uri NAV_BAR_KIDS_MODE = Settings.Secure.getUriFor(
             Settings.Secure.NAV_BAR_KIDS_MODE);
 
+    private static final Uri ENABLE_TASKBAR_URI = Settings.System.getUriFor(
+            Settings.System.ENABLE_TASKBAR);
+
     private final Context mContext;
     private final @Nullable Context mNavigationBarPanelContext;
     private WindowManager mWindowManager;
@@ -137,6 +142,7 @@ public class TaskbarManager {
      */
     private final OnIDPChangeListener mIdpChangeListener = c -> recreateTaskbar();
     private final SettingsCache.OnChangeListener mOnSettingsChangeListener = c -> recreateTaskbar();
+    private final SettingsCache.OnChangeListener mEnableTaskBarListener;
 
     private boolean mUserUnlocked = false;
 
@@ -276,6 +282,18 @@ public void onLowMemory() { }
         SettingsCache.INSTANCE.get(mContext)
                 .register(NAV_BAR_KIDS_MODE, mOnSettingsChangeListener);
         Log.d(TASKBAR_NOT_DESTROYED_TAG, "registering component callbacks from constructor.");
+        mEnableTaskBarListener = c -> {
+            // Create the illusion of this taking effect immediately
+            // Also needed because TaskbarManager inits before SystemUiProxy on start
+            boolean enabled = Settings.System.getInt(mContext.getContentResolver(),
+                    Settings.System.ENABLE_TASKBAR, 0) == 1;
+            SystemUiProxy.INSTANCE.get(mContext).setTaskbarEnabled(enabled);
+
+            // Restart launcher
+            System.exit(0);
+        };
+        SettingsCache.INSTANCE.get(mContext)
+                .register(ENABLE_TASKBAR_URI, mEnableTaskBarListener);
         mContext.registerComponentCallbacks(mComponentCallbacks);
         mShutdownReceiver.register(mContext, Intent.ACTION_SHUTDOWN);
         UI_HELPER_EXECUTOR.execute(() -> {
@@ -428,13 +446,12 @@ public void recreateTaskbar() {
             destroyExistingTaskbar();
 
             boolean isTaskbarEnabled = dp != null && isTaskbarPresent(dp);
-
-            SystemUiProxy sysui = SystemUiProxy.INSTANCE.get(mContext);
-            sysui.setTaskbarEnabled(isTaskbarEnabled);
             debugWhyTaskbarNotDestroyed("recreateTaskbar: isTaskbarEnabled=" + isTaskbarEnabled
                 + " [dp != null (i.e. mUserUnlocked)]=" + (dp != null)
                 + " FLAG_HIDE_NAVBAR_WINDOW=" + ENABLE_TASKBAR_NAVBAR_UNIFICATION
                 + " dp.isTaskbarPresent=" + (dp == null ? "null" : dp.isTaskbarPresent));
+            SystemUiProxy sysui = SystemUiProxy.INSTANCE.get(mContext);
+            sysui.setTaskbarEnabled(isTaskbarEnabled);
             if (!isTaskbarEnabled) {
                 sysui.notifyTaskbarStatus(/* visible */ false, /* stashed */ false);
                 return;
diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
index 6c2a44e0fa0..a0f46dff5e4 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
@@ -35,6 +35,7 @@
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.Insettable;
 import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.AnimatorListeners;
 import com.android.launcher3.anim.PendingAnimation;
 import com.android.launcher3.Utilities;
diff --git a/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java b/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java
index 0efa0261f48..9934d3d4801 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/ApiWrapper.java
@@ -71,7 +71,9 @@ public static Map<UserHandle, UserIconInfo> queryAllUsers(Context context) {
         UserManager um = context.getSystemService(UserManager.class);
         Map<UserHandle, UserIconInfo> users = new ArrayMap<>();
         List<UserHandle> usersActual = um.getUserProfiles();
-        usersActual.addAll(ParallelSpaceManager.getInstance().getParallelUserHandles());
+        List<UserHandle> parallelUsers =
+                ParallelSpaceManager.getInstance().getParallelUserHandles();
+        usersActual.addAll(parallelUsers);
         if (usersActual != null) {
             for (UserHandle user : usersActual) {
                 if (android.os.Flags.allowPrivateProfile() && Flags.enablePrivateSpace()) {
@@ -93,7 +95,10 @@ public static Map<UserHandle, UserIconInfo> queryAllUsers(Context context) {
                     // Simple check to check if the provided user is work profile
                     // TODO: Migrate to a better platform API
                     NoopDrawable d = new NoopDrawable();
-                    boolean isWork = (d != context.getPackageManager().getUserBadgedIcon(d, user));
+                    // Parallel users also have badge so don't consider it as work profile
+                    boolean isParallelUser = parallelUsers.contains(user);
+                    boolean isWork = !isParallelUser &&
+                            d != context.getPackageManager().getUserBadgedIcon(d, user);
                     UserIconInfo info = new UserIconInfo(
                             user,
                             isWork ? UserIconInfo.TYPE_WORK : UserIconInfo.TYPE_MAIN,
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index fbfd7feae21..70afc1b82db 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -39,6 +39,7 @@
 import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;
 import static com.android.launcher3.popup.QuickstepSystemShortcut.getSplitSelectShortcutByPosition;
 import static com.android.launcher3.popup.SystemShortcut.APP_INFO;
+import static com.android.launcher3.popup.SystemShortcut.FREE_FORM;
 import static com.android.launcher3.popup.SystemShortcut.INSTALL;
 import static com.android.launcher3.popup.SystemShortcut.WIDGETS;
 import static com.android.launcher3.taskbar.LauncherTaskbarUIController.ALL_APPS_PAGE_PROGRESS_INDEX;
@@ -443,6 +444,7 @@ public Stream<SystemShortcut.Factory> getSupportedShortcuts() {
         List<SystemShortcut.Factory> shortcuts = new ArrayList(Arrays.asList(
                 APP_INFO, WellbeingModel.SHORTCUT_FACTORY, mHotseatPredictionController));
         shortcuts.addAll(getSplitShortcuts());
+        shortcuts.add(FREE_FORM);
         shortcuts.add(WIDGETS);
         shortcuts.add(INSTALL);
         return shortcuts.stream();
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
index 6651c7399e4..4407afdd9fd 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java
@@ -149,20 +149,21 @@ public void prepareForAtomicAnimation(LauncherState fromState, LauncherState toS
 
             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;
+            boolean isWorkspaceVisible = workspace != null && workspace.getVisibility() == VISIBLE;
             if (isWorkspaceVisible) {
                 CellLayout currentChild = (CellLayout) workspace.getChildAt(
                         workspace.getCurrentPage());
-                isWorkspaceVisible = currentChild.getVisibility() == VISIBLE
+                isWorkspaceVisible = currentChild != null && currentChild.getVisibility() == VISIBLE
                         && currentChild.getShortcutsAndWidgets().getAlpha() > 0;
             }
-            if (!isWorkspaceVisible) {
+            if (!isWorkspaceVisible && workspace != null) {
                 workspace.setScaleX(WORKSPACE_PREPARE_SCALE);
                 workspace.setScaleY(WORKSPACE_PREPARE_SCALE);
             }
             Hotseat hotseat = mActivity.getHotseat();
-            boolean isHotseatVisible = hotseat.getVisibility() == VISIBLE && hotseat.getAlpha() > 0;
-            if (!isHotseatVisible) {
+            boolean isHotseatVisible = hotseat != null
+                    && hotseat.getVisibility() == VISIBLE && hotseat.getAlpha() > 0;
+            if (!isHotseatVisible && hotseat != null) {
                 hotseat.setScaleX(WORKSPACE_PREPARE_SCALE);
                 hotseat.setScaleY(WORKSPACE_PREPARE_SCALE);
             }
@@ -184,7 +185,7 @@ public void prepareForAtomicAnimation(LauncherState fromState, LauncherState toS
                 config.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);
 
                 // Scale up the recents, if it is not coming from the side
-                if (overview.getVisibility() != VISIBLE || overview.getContentAlpha() == 0) {
+                if (overview != null && overview.getVisibility() != VISIBLE || overview.getContentAlpha() == 0) {
                     RECENTS_SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);
                 }
             }
diff --git a/quickstep/src/com/android/quickstep/NavHandle.java b/quickstep/src/com/android/quickstep/NavHandle.java
new file mode 100644
index 00000000000..da3311f4753
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/NavHandle.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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 android.content.Context;
+
+import com.android.launcher3.R;
+
+/**
+ * Control and get information about the gesture nav bar at the bottom of the screen, which has
+ * historically been drawn by SysUI, but is also emulated by the stashed Taskbar on large screens.
+ */
+public interface NavHandle {
+
+    /**
+     * Animate the nav bar being long-pressed.
+     *
+     * @param isTouchDown {@code true} if the button is starting to be pressed ({@code false} if
+     *                                released or canceled)
+     * @param shrink {@code true} if the handle should shrink, {@code false} if it should grow
+     * @param durationMs how long the animation should take (for the {@code isTouchDown} case, this
+     *                   should be the same as the amount of time to trigger a long-press)
+     */
+    void animateNavBarLongPress(boolean isTouchDown, boolean shrink, long durationMs);
+
+    /** @return {@code true} if this nav handle is actually the stashed taskbar */
+    default boolean isNavHandleStashedTaskbar() {
+        return false;
+    }
+
+    /** @return {@code true} if this nav handle can currently accept long presses */
+    default boolean canNavHandleBeLongPressed() {
+        return true;
+    }
+
+    /** @return the width of this nav handle, in pixels */
+    default int getNavHandleWidth(Context context) {
+        return context.getResources().getDimensionPixelSize(R.dimen.navigation_home_handle_width);
+    }
+}
diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 0cb04bfb239..613da968c46 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -106,7 +106,7 @@
 /**
  * Holds the reference to SystemUI.
  */
-public class SystemUiProxy implements ISystemUiProxy {
+public class SystemUiProxy implements ISystemUiProxy, NavHandle {
     private static final String TAG = SystemUiProxy.class.getSimpleName();
 
     public static final MainThreadInitializedObject<SystemUiProxy> INSTANCE =
diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index 86f5ce16217..b4c1507652f 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -1002,14 +1002,22 @@ private InputConsumer newConsumer(
                     base = new TaskbarUnstashInputConsumer(this, base, mInputMonitorCompat, tac,
                             mOverviewCommandHelper);
                 }
-            } else if (canStartSystemGesture && !previousGestureState.isRecentsAnimationRunning()) {
+            }
+
+            NavHandle navHandle = tac != null ? tac.getNavHandle()
+                    : SystemUiProxy.INSTANCE.get(this);
+            if (canStartSystemGesture && !previousGestureState.isRecentsAnimationRunning()
+                    && navHandle.canNavHandleBeLongPressed()) {
                 reasonString.append(NEWLINE_PREFIX)
                         .append(reasonPrefix)
                         .append(SUBSTRING_PREFIX)
-                        .append("Not running recents animation, ")
-                        .append("using NavHandleLongPressInputConsumer");
+                        .append("Not running recents animation, ");
+                if (tac != null && tac.getNavHandle().canNavHandleBeLongPressed()) {
+                    reasonString.append("stashed handle is long-pressable, ");
+                }
+                reasonString.append("using NavHandleLongPressInputConsumer");
                 base = new NavHandleLongPressInputConsumer(this, base, mInputMonitorCompat,
-                        mDeviceState);
+                        mDeviceState, navHandle);
             }
 
             if (mDeviceState.isBubblesExpanded()) {
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandler.java b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandler.java
index 4d47f07b045..1d00e533f5c 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandler.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressHandler.java
@@ -22,6 +22,7 @@
 
 import com.android.launcher3.R;
 import com.android.launcher3.util.ResourceBasedOverride;
+import com.android.quickstep.NavHandle;
 
 /**
  * Class for extending nav handle long press behavior
@@ -42,19 +43,26 @@ public static NavHandleLongPressHandler newInstance(Context context) {
      * A Runnable is returned here to ensure the InputConsumer can call
      * {@link android.view.InputMonitor#pilferPointers()} before invoking the long press behavior
      * since pilfering can break the long press behavior.
+     *
+     * @param navHandle to handle this long press
      */
-    public @Nullable Runnable getLongPressRunnable() {
+    public @Nullable Runnable getLongPressRunnable(NavHandle navHandle) {
         return null;
     }
 
     /**
      * Called when nav handle gesture starts.
+     *
+     * @param navHandle to handle the animation for this touch
      */
-    public void onTouchStarted() {}
+    public void onTouchStarted(NavHandle navHandle) {}
 
     /**
      * Called when nav handle gesture is finished by the user lifting their finger or the system
      * cancelling the touch for some other reason.
+     *
+     * @param navHandle to handle the animation for this touch
+     * @param reason why the touch ended
      */
-    public void onTouchFinished(String reason) {}
+    public void onTouchFinished(NavHandle navHandle, String reason) {}
 }
diff --git a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java
index 0a558e2a983..4c0b55088e8 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/NavHandleLongPressInputConsumer.java
@@ -17,7 +17,9 @@
 
 import static com.android.launcher3.LauncherPrefs.LONG_PRESS_NAV_HANDLE_TIMEOUT_MS;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DEEP_PRESS_NAVBAR;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DEEP_PRESS_STASHED_TASKBAR;
 import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LONG_PRESS_NAVBAR;
+import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_LONG_PRESS_STASHED_TASKBAR;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 
 import android.content.Context;
@@ -25,11 +27,11 @@
 import android.view.ViewConfiguration;
 
 import com.android.launcher3.LauncherPrefs;
-import com.android.launcher3.R;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.logging.StatsLogManager;
 import com.android.launcher3.util.DisplayController;
 import com.android.quickstep.InputConsumer;
+import com.android.quickstep.NavHandle;
 import com.android.quickstep.RecentsAnimationDeviceState;
 import com.android.quickstep.TopTaskTracker;
 import com.android.systemui.shared.system.InputMonitorCompat;
@@ -47,6 +49,7 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer {
     private final float mTouchSlopSquared;
     private final int mLongPressTimeout;
     private final boolean mDeepPressEnabled;
+    private final NavHandle mNavHandle;
     private final StatsLogManager mStatsLogManager;
     private final TopTaskTracker mTopTaskTracker;
 
@@ -54,10 +57,9 @@ public class NavHandleLongPressInputConsumer extends DelegateInputConsumer {
     private boolean mDeepPressLogged;  // Whether deep press has been logged for the current touch.
 
     public NavHandleLongPressInputConsumer(Context context, InputConsumer delegate,
-            InputMonitorCompat inputMonitor, RecentsAnimationDeviceState deviceState) {
+            InputMonitorCompat inputMonitor, RecentsAnimationDeviceState deviceState,
+            NavHandle navHandle) {
         super(delegate, inputMonitor);
-        mNavHandleWidth = context.getResources().getDimensionPixelSize(
-                R.dimen.navigation_home_handle_width);
         mScreenWidth = DisplayController.INSTANCE.get(context).getInfo().currentSize.x;
         mDeepPressEnabled = FeatureFlags.ENABLE_LPNH_DEEP_PRESS.get();
         if (FeatureFlags.CUSTOM_LPNH_THRESHOLDS.get()) {
@@ -66,6 +68,8 @@ public NavHandleLongPressInputConsumer(Context context, InputConsumer delegate,
             mLongPressTimeout = ViewConfiguration.getLongPressTimeout();
         }
         mTouchSlopSquared = deviceState.getSquaredTouchSlop();
+        mNavHandle = navHandle;
+        mNavHandleWidth = navHandle.getNavHandleWidth(context);
         mNavHandleLongPressHandler = NavHandleLongPressHandler.newInstance(context);
         mStatsLogManager = StatsLogManager.newInstance(context);
         mTopTaskTracker = TopTaskTracker.INSTANCE.get(context);
@@ -89,6 +93,11 @@ public void onMotionEvent(MotionEvent ev) {
         }
     }
 
+    @Override
+    public void onHoverEvent(MotionEvent ev) {
+        mDelegate.onHoverEvent(ev);
+    }
+
     private void handleMotionEvent(MotionEvent ev) {
         switch (ev.getAction()) {
             case MotionEvent.ACTION_DOWN -> {
@@ -98,9 +107,8 @@ private void handleMotionEvent(MotionEvent ev) {
                 mCurrentDownEvent = MotionEvent.obtain(ev);
                 mDeepPressLogged = false;
                 if (isInNavBarHorizontalArea(ev.getRawX())) {
-                    mNavHandleLongPressHandler.onTouchStarted();
-                    MAIN_EXECUTOR.getHandler().postDelayed(mTriggerLongPress,
-                            mLongPressTimeout);
+                    mNavHandleLongPressHandler.onTouchStarted(mNavHandle);
+                    MAIN_EXECUTOR.getHandler().postDelayed(mTriggerLongPress, mLongPressTimeout);
                 }
             }
             case MotionEvent.ACTION_MOVE -> {
@@ -127,8 +135,9 @@ private void handleMotionEvent(MotionEvent ev) {
             // Log deep press even if feature is disabled.
             String runningPackage = mTopTaskTracker.getCachedTopTask(
                     /* filterOnlyVisibleRecents */ true).getPackageName();
-            mStatsLogManager.logger().withPackageName(runningPackage)
-                    .log(LAUNCHER_DEEP_PRESS_NAVBAR);
+            mStatsLogManager.logger().withPackageName(runningPackage).log(
+                    mNavHandle.isNavHandleStashedTaskbar() ? LAUNCHER_DEEP_PRESS_STASHED_TASKBAR
+                            : LAUNCHER_DEEP_PRESS_NAVBAR);
             mDeepPressLogged = true;
 
             // But only trigger if the feature is enabled.
@@ -142,9 +151,11 @@ private void handleMotionEvent(MotionEvent ev) {
     private void triggerLongPress() {
         String runningPackage = mTopTaskTracker.getCachedTopTask(
                 /* filterOnlyVisibleRecents */ true).getPackageName();
-        mStatsLogManager.logger().withPackageName(runningPackage).log(LAUNCHER_LONG_PRESS_NAVBAR);
+        mStatsLogManager.logger().withPackageName(runningPackage).log(
+                mNavHandle.isNavHandleStashedTaskbar() ? LAUNCHER_LONG_PRESS_STASHED_TASKBAR
+                        : LAUNCHER_LONG_PRESS_NAVBAR);
 
-        Runnable longPressRunnable = mNavHandleLongPressHandler.getLongPressRunnable();
+        Runnable longPressRunnable = mNavHandleLongPressHandler.getLongPressRunnable(mNavHandle);
         if (longPressRunnable == null) {
             return;
         }
@@ -161,7 +172,7 @@ private void triggerLongPress() {
 
     private void cancelLongPress(String reason) {
         MAIN_EXECUTOR.getHandler().removeCallbacks(mTriggerLongPress);
-        mNavHandleLongPressHandler.onTouchFinished(reason);
+        mNavHandleLongPressHandler.onTouchFinished(mNavHandle, reason);
     }
 
     private boolean isInNavBarHorizontalArea(float x) {
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 1220adb2b61..d3b43d44050 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -203,7 +203,7 @@ private void updateVisibilities() {
         lens.setVisibility(mLens && Utilities.isGSAEnabled(getContext()) ? VISIBLE : GONE);
         findViewById(R.id.lens_space).setVisibility(mLens && Utilities.isGSAEnabled(getContext()) ? VISIBLE : GONE);
 
-        mSplitButton = findViewById(R.id.action_split);
+        mSplitButton = findViewById(mUseChips ? R.id.action2_split : R.id.action_split);
         mSplitButton.setOnClickListener(this);
     }
 
diff --git a/res/drawable/bg_quickspace.xml b/res/drawable/bg_quickspace.xml
new file mode 100644
index 00000000000..1f6bede56d0
--- /dev/null
+++ b/res/drawable/bg_quickspace.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2023 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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" />
\ No newline at end of file
diff --git a/res/drawable/ic_music_note_24dp.xml b/res/drawable/ic_music_note_24dp.xml
new file mode 100644
index 00000000000..323633f8327
--- /dev/null
+++ b/res/drawable/ic_music_note_24dp.xml
@@ -0,0 +1,10 @@
+<?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"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z"/>
+</vector>
diff --git a/res/drawable/ic_quickspace_derp.xml b/res/drawable/ic_quickspace_derp.xml
new file mode 100644
index 00000000000..83bd670054b
--- /dev/null
+++ b/res/drawable/ic_quickspace_derp.xml
@@ -0,0 +1,18 @@
+<?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"
+    android:viewportHeight="24"
+    android:tint="?android:attr/textColorPrimary">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M 9.25 8.5 C 9.66421356237 8.5 10 8.83578643763 10 9.25 C 10 9.66421356237 9.66421356237 10 9.25 10 C 8.83578643763 10 8.5 9.66421356237 8.5 9.25 C 8.5 8.83578643763 8.83578643763 8.5 9.25 8.5 Z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M 14.75 8.5 C 15.1642135624 8.5 15.5 8.83578643763 15.5 9.25 C 15.5 9.66421356237 15.1642135624 10 14.75 10 C 14.3357864376 10 14 9.66421356237 14 9.25 C 14 8.83578643763 14.3357864376 8.5 14.75 8.5 Z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,9.11047V3.20709a0.5 0.5 ,0,0,0-0.85358-0.35358L15.11865,4.88135a5.95958,5.95958,0,0,0-6.27173 0.02087 l-1.99-2.02863A0.5 0.5 ,0,0,0,6,3.22369V9.11047C4.85895,9.62012,4,11.83917,4,14.5,4,17.53754,5.11926,20,6.5,20a1.33406,1.33406,0,0,0,0.79272-0.28693,5.98805,5.98805,0,0,0,9.41455,0A1.33406,1.33406,0,0,0,17.5,20c1.38074,0,2.5-2.46246,2.5-5.5C20,11.83917,19.14105,9.62012,18,9.11047ZM9.25,11.25a2,2,0,1,1,2-2A2,2,0,0,1,9.25,11.25ZM12,14l-1-2c0-0.3595,2-0.3595,2,0Zm2.75-2.75a2,2,0,1,1,2-2A2,2,0,0,1,14.75,11.25Z" />
+</vector>
diff --git a/res/drawable/ic_quickspace_evening.xml b/res/drawable/ic_quickspace_evening.xml
new file mode 100644
index 00000000000..2192cf4d329
--- /dev/null
+++ b/res/drawable/ic_quickspace_evening.xml
@@ -0,0 +1,8 @@
+<!-- drawable/moon_waning_crescent.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M2 12A10 10 0 0 0 15 21.54A10 10 0 0 1 15 2.46A10 10 0 0 0 2 12Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_quickspace_midnight.xml b/res/drawable/ic_quickspace_midnight.xml
new file mode 100644
index 00000000000..5b83510320e
--- /dev/null
+++ b/res/drawable/ic_quickspace_midnight.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z" />
+</vector>
diff --git a/res/drawable/ic_quickspace_morning.xml b/res/drawable/ic_quickspace_morning.xml
new file mode 100644
index 00000000000..b74fc674873
--- /dev/null
+++ b/res/drawable/ic_quickspace_morning.xml
@@ -0,0 +1,8 @@
+<!-- drawable/white_balance_sunny.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#fff" android:pathData="M3.55,18.54L4.96,19.95L6.76,18.16L5.34,16.74M11,22.45C11.32,22.45 13,22.45 13,22.45V19.5H11M12,5.5A6,6 0 0,0 6,11.5A6,6 0 0,0 12,17.5A6,6 0 0,0 18,11.5C18,8.18 15.31,5.5 12,5.5M20,12.5H23V10.5H20M17.24,18.16L19.04,19.95L20.45,18.54L18.66,16.74M20.45,4.46L19.04,3.05L17.24,4.84L18.66,6.26M13,0.55H11V3.5H13M4,10.5H1V12.5H4M6.76,4.84L4.96,3.05L3.55,4.46L5.34,6.26L6.76,4.84Z" />
+</vector>
\ No newline at end of file
diff --git a/res/layout/quickspace_alternate_double.xml b/res/layout/quickspace_alternate_double.xml
new file mode 100644
index 00000000000..8ec007f0643
--- /dev/null
+++ b/res/layout/quickspace_alternate_double.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020-2023 crDroid Android Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/quickspace_content"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="start|center_vertical"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="start|center_vertical"
+        android:gravity="start|center_vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp">
+
+        <com.android.launcher3.quickspace.views.DoubleShadowTextView
+            android:id="@+id/extended_greetings"
+            style="@style/QuickSpaceText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:textColor="?workspaceAccentColor"
+            android:textSize="@dimen/quickspace_alternate_title_size"
+            android:visibility="gone"
+            android:paddingEnd="6dp"
+            launcher:ambientShadowBlur="3dp"
+            launcher:ambientShadowColor="?workspaceAmbientShadowColor"
+            launcher:keyShadowBlur="2dp"
+            launcher:keyShadowColor="?workspaceKeyShadowColor"
+            launcher:keyShadowOffsetX="0.5dip" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="start|center_vertical"
+        android:gravity="start|center_vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp">
+
+        <com.android.launcher3.quickspace.views.DoubleShadowTextView
+            android:id="@+id/extended_greetings_clock"
+            style="@style/QuickSpaceText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:textColor="?workspaceAccentColor"
+            android:textSize="@dimen/quickspace_alternate_title_size"
+            android:paddingEnd="6dp"
+            android:visibility="gone"
+            launcher:ambientShadowBlur="3dp"
+            launcher:ambientShadowColor="?workspaceAmbientShadowColor"
+            launcher:keyShadowBlur="2dp"
+            launcher:keyShadowColor="?workspaceKeyShadowColor"
+            launcher:keyShadowOffsetX="0.5dip" />
+
+        <com.android.launcher3.quickspace.views.DoubleShadowTextView
+            android:id="@+id/quick_event_title"
+            style="@style/QuickSpaceText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:singleLine="true"
+            android:scrollHorizontally="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:textColor="?workspaceTextColor"
+            android:textSize="@dimen/quickspace_alternate_title_size"
+            launcher:ambientShadowBlur="3dp"
+            launcher:ambientShadowColor="?workspaceAmbientShadowColor"
+            launcher:keyShadowBlur="2dp"
+            launcher:keyShadowColor="?workspaceKeyShadowColor"
+            launcher:keyShadowOffsetX="0.5dip" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/subtitle_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:layout_marginEnd="16dp"
+        android:orientation="horizontal"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp">
+
+        <ImageView
+            android:id="@+id/quick_event_icon_sub"
+            android:layout_width="26dp"
+            android:layout_height="20dp"
+            android:layout_gravity="start|center_vertical"
+            android:scaleType="fitXY"
+            android:layout_weight="0.0"
+            android:paddingEnd="6dp" />
+
+        <com.android.launcher3.quickspace.views.DoubleShadowTextView
+            android:id="@+id/quick_event_title_sub_colored"
+            style="@style/QuickSpaceText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:layout_weight="1.0"
+            android:drawablePadding="8dp"
+            android:visibility="gone"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:scrollHorizontally="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:textColor="?workspaceAccentColor"
+            android:textSize="@dimen/quickspace_alternate_subtitle_size"
+            android:letterSpacing="0.02"
+            android:paddingEnd="6dp"
+            launcher:ambientShadowBlur="3dp"
+            launcher:ambientShadowColor="?workspaceAmbientShadowColor"
+            launcher:keyShadowBlur="2dp"
+            launcher:keyShadowColor="?workspaceKeyShadowColor"
+            launcher:keyShadowOffsetX="0.5dip" />
+
+        <com.android.launcher3.quickspace.views.DoubleShadowTextView
+            android:id="@+id/quick_event_title_sub"
+            style="@style/QuickSpaceSubText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:layout_weight="1.0"
+            android:drawablePadding="8dp"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:scrollHorizontally="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:textColor="?workspaceTextColor"
+            android:textSize="@dimen/quickspace_alternate_subtitle_size"
+            android:letterSpacing="0.02"
+            launcher:ambientShadowBlur="3dp"
+            launcher:ambientShadowColor="?workspaceAmbientShadowColor"
+            launcher:keyShadowBlur="2dp"
+            launcher:keyShadowColor="?workspaceKeyShadowColor"
+            launcher:keyShadowOffsetX="0.5dip" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="start|center_vertical"
+        android:gravity="start|center_vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp">
+
+        <LinearLayout
+            android:id="@+id/quick_event_weather_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:layout_weight="0.0"
+            android:clickable="true"
+            android:gravity="start|center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/quick_event_weather_icon"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="start|center_vertical"
+                android:scaleType="fitXY" />
+
+            <com.android.launcher3.quickspace.views.DoubleShadowTextView
+                android:id="@+id/quick_event_weather_temp"
+                style="@style/QuickSpaceText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
+                android:drawablePadding="8dp"
+                android:paddingStart="6dp"
+                android:textColor="?workspaceTextColor"
+                android:textSize="@dimen/quickspace_alternate_subtitle_size"
+                android:letterSpacing="0.02"
+                launcher:ambientShadowBlur="3dp"
+                launcher:ambientShadowColor="?workspaceAmbientShadowColor"
+                launcher:keyShadowBlur="2dp"
+                launcher:keyShadowColor="?workspaceKeyShadowColor"
+                launcher:keyShadowOffsetX="0.5dip" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/quickspace_doubleline.xml b/res/layout/quickspace_doubleline.xml
new file mode 100644
index 00000000000..3eb9aec7886
--- /dev/null
+++ b/res/layout/quickspace_doubleline.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018 CypherOS
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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"
+    xmlns:launcher="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/quickspace_content"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="start|center_vertical"
+    android:orientation="vertical">
+
+    <com.android.launcher3.quickspace.views.DoubleShadowTextView
+        android:id="@+id/quick_event_title"
+        style="@style/QuickSpaceText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:singleLine="true"
+        android:scrollHorizontally="true"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:textColor="?workspaceTextColor"
+        android:textSize="@dimen/quickspace_title_size"
+        launcher:ambientShadowBlur="3dp"
+        launcher:ambientShadowColor="?workspaceAmbientShadowColor"
+        launcher:keyShadowBlur="2dp"
+        launcher:keyShadowColor="?workspaceKeyShadowColor"
+        launcher:keyShadowOffsetX="0.5dip" />
+
+    <LinearLayout
+        android:id="@+id/subtitle_line"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:layout_marginEnd="16dp"
+        android:orientation="horizontal"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp">
+
+        <ImageView
+            android:id="@+id/quick_event_icon_sub"
+            android:layout_width="26dp"
+            android:layout_height="20dp"
+            android:layout_gravity="start|center_vertical"
+            android:scaleType="fitXY"
+            android:layout_weight="0.0"
+            android:paddingEnd="6dp" />
+
+        <com.android.launcher3.quickspace.views.DoubleShadowTextView
+            android:id="@+id/quick_event_title_sub"
+            style="@style/QuickSpaceSubText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:layout_weight="1.0"
+            android:drawablePadding="8dp"
+            android:includeFontPadding="false"
+            android:singleLine="true"
+            android:scrollHorizontally="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:textColor="?workspaceTextColor"
+            android:textSize="@dimen/quickspace_subtitle_size"
+            android:letterSpacing="0.02"
+            launcher:ambientShadowBlur="3dp"
+            launcher:ambientShadowColor="?workspaceAmbientShadowColor"
+            launcher:keyShadowBlur="2dp"
+            launcher:keyShadowColor="?workspaceKeyShadowColor"
+            launcher:keyShadowOffsetX="0.5dip" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="start|center_vertical"
+        android:gravity="start|center_vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp">
+
+        <LinearLayout
+            android:id="@+id/quick_event_weather_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start|center_vertical"
+            android:layout_weight="0.0"
+            android:background="@drawable/bg_quickspace"
+            android:clickable="true"
+            android:gravity="start|center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="16dp"
+            android:paddingTop="8dp">
+
+            <ImageView
+                android:id="@+id/quick_event_weather_icon"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="start|center_vertical"
+                android:scaleType="fitXY" />
+
+            <com.android.launcher3.quickspace.views.DoubleShadowTextView
+                android:id="@+id/quick_event_weather_temp"
+                style="@style/QuickSpaceSubText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
+                android:drawablePadding="8dp"
+                android:paddingStart="6dp"
+                android:textColor="?workspaceTextColor"
+                android:textSize="@dimen/quickspace_subtitle_size"
+                android:letterSpacing="0.02"
+                launcher:ambientShadowBlur="3dp"
+                launcher:ambientShadowColor="?workspaceAmbientShadowColor"
+                launcher:keyShadowBlur="2dp"
+                launcher:keyShadowColor="?workspaceKeyShadowColor"
+                launcher:keyShadowOffsetX="0.5dip" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/reserved_container_alternate_workspace.xml b/res/layout/reserved_container_alternate_workspace.xml
new file mode 100644
index 00000000000..d67157f18be
--- /dev/null
+++ b/res/layout/reserved_container_alternate_workspace.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020-2023 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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.quickspace.QuickSpaceView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@id/reserved_container_workspace"
+        android:background="?android:selectableItemBackground"
+        android:clickable="false"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:animateLayoutChanges="true">
+
+        <com.android.launcher3.BubbleTextView
+            android:id="@+id/dummyBubbleTextView"
+            android:visibility="invisible"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:contentDescription="" />
+
+    <include layout="@layout/quickspace_alternate_double" />
+</com.android.launcher3.quickspace.QuickSpaceView>
diff --git a/res/layout/reserved_container_workspace.xml b/res/layout/reserved_container_workspace.xml
new file mode 100644
index 00000000000..76efb132480
--- /dev/null
+++ b/res/layout/reserved_container_workspace.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018-2023 crDroid Android Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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.quickspace.QuickSpaceView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@id/reserved_container_workspace"
+        android:background="?android:selectableItemBackground"
+        android:clickable="false"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:animateLayoutChanges="true">
+
+        <com.android.launcher3.BubbleTextView
+            android:layout_gravity="center"
+            android:id="@+id/dummyBubbleTextView"
+            android:visibility="invisible"
+            android:layout_width="0dp"
+            android:layout_height="36dp"
+            android:contentDescription="" />
+
+    <include layout="@layout/quickspace_doubleline" />
+</com.android.launcher3.quickspace.QuickSpaceView>
diff --git a/res/values-de/derp_strings.xml b/res/values-de/derp_strings.xml
index 80c20f2e1cc..588d68fbed1 100644
--- a/res/values-de/derp_strings.xml
+++ b/res/values-de/derp_strings.xml
@@ -155,7 +155,6 @@
 
     <!-- About info -->
     <string name="about_app_subtitle">Basierend auf AOSP Launcher3</string>
-    <string name="about_app_version">AP1A.240305.019</string>
     <string name="about_thanks_cat">Besonderen Dank an</string>
     <string name="about">Über</string>
     <string name="about_summary">Info über den DerpLauncher</string>
diff --git a/res/values-zh-rTW/derp_strings.xml b/res/values-zh-rTW/derp_strings.xml
new file mode 100644
index 00000000000..488ae47389d
--- /dev/null
+++ b/res/values-zh-rTW/derp_strings.xml
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 DerpFest
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- General -->
+    <string name="settings_title">主畫面設定</string>
+
+    <!-- Categories -->
+    <string name="home_category_title">主畫面</string>
+    <string name="home_category_summary">Set home panel and more</string>
+    <string name="icons_category_title">圖示</string>
+    <string name="icons_category_summary">Set icon size and more</string>
+    <string name="app_drawer_category_title">應用程式抽屜</string>
+    <string name="app_drawer_category_summary">自訂你的應用程式抽屜</string>
+    <string name="recents_category_title">Recents</string>
+    <string name="recents_category_summary">Revamp the overview screen</string>
+    <string name="misc_category_title">雜項</string>
+    <string name="misc_category_summary">其他選項</string>
+    <string name="general_category_title">一般</string>
+    <string name="interface_category_title">Interface</string>
+    <string name="quickspace_category_title">資訊一覽</string>
+    <string name="search_bar_category_title">搜尋列</string>
+    <string name="actions_category_title">快速操作</string>
+
+    <!-- Developer options -->
+    <string name="dev_options_title">開發人員選項</string>
+    <string name="dev_options_summary">Enable some hidden features at your own risk</string>
+
+    <!-- Edit workspace -->
+    <string name="settings_lock_layout_title">鎖定佈局</string>
+    <string name="settings_lock_layout_summary_on">禁止在桌面上新增、移除或移動圖示和小工具</string>
+    <string name="settings_lock_layout_summary_off">允許在桌面上新增、移除或移動圖示和小工</string>
+    <string name="settings_edit_widgets_error">無法將小工具新增至主畫面</string>
+
+    <!-- Hide labels -->
+    <string name="title_desktop_labels">桌面標籤</string>
+    <string name="summary_desktop_labels">在桌面上顯示圖示名稱</string>
+    <string name="title_drawer_labels">應用程式抽屜標籤</string>
+    <string name="summary_drawer_labels">在應用程式抽屜上顯示圖示名稱</string>
+
+    <!-- Settings title to show Google Now at -1 screen on launcher. [CHAR LIMIT=50] -->
+    <string name="title_show_google_app">Swipe to access Google app</string>
+    <!-- Settings message explaining when the -1 screen is available on an LTR device. [CHAR LIMIT=100] -->
+    <string name="msg_minus_one_on_left">When you swipe right from main home screen</string>
+    <!-- Settings message explaining when the -1 screen is available on an RTL device. [CHAR LIMIT=100] -->
+    <string name="msg_minus_one_on_right">When you swipe left from main home screen</string>
+
+    <!-- DT2S -->
+    <string name="pref_sleep_gesture_title">輕觸兩下即可休眠</string>
+    <string name="pref_sleep_gesture_summary">在空白處點兩下即可關閉螢幕</string>
+
+    <!-- Custom seekbar -->
+    <string name="custom_seekbar_value">值：<xliff:g id="v">%s</xliff:g></string>
+    <string name="custom_seekbar_default_value">預設</string>
+    <string name="custom_seekbar_default_value_to_set">預設值：<xliff:g id="v">%s</xliff:g>\n長按即可設定</string>
+    <string name="custom_seekbar_default_value_is_set">已設定為預設值</string>
+
+    <!-- Icon size -->
+    <string name="icon_size_title">圖示大小</string>
+
+    <!-- Font size -->
+    <string name="font_size_title">字體大小</string>
+
+    <!-- App label - max lines -->
+    <string name="icon_max_lines_title">Max lines for app label</string>
+
+    <!-- Hotseat searchbar -->
+    <string name="label_search">搜尋</string>
+    <string name="label_lens">智慧鏡頭</string>
+    <string name="label_voice_search">語音搜尋</string>
+    <string name="dock_search_title">Google 搜尋列</string>
+    <string name="dock_search_summary">在底部顯示搜尋列</string>
+
+    <!-- Hotseat Background -->
+    <string name="hotseat_bg_title">底欄背景</string>
+    <string name="hotseat_bg_summary">在應用程式底欄上添加透明背景</string>
+
+    <!-- Wallpaper scrolling -->
+    <string name="allow_wallpaper_scrolling">桌布滑動</string>
+    <string name="allow_wallpaper_scrolling_summary">Wallpaper scrolling effect for multiple screens</string>
+
+    <!-- Wallpaper zooming -->
+    <string name="allow_wallpaper_zooming">桌布縮放</string>
+    <string name="allow_wallpaper_zooming_summary">Zoom in or out the wallpaper when using drawer or recent apps</string>
+
+    <!-- Homescreen Statusbar -->
+    <string name="show_statusbar_title">顯示狀態列</string>
+    <string name="show_statusbar_summary">在主畫面上顯示狀態列</string>
+
+    <!-- Top shadow -->
+    <string name="show_top_shadow_title">顯示頂部陰影</string>
+    <string name="show_top_shadow_summary">在狀態列下方添加陰影</string>
+
+    <!-- Row Height -->
+    <string name="row_height_title">列高</string>
+    
+    <!-- Background blur -->
+    <string name="background_blur_title">背景模糊度</string>
+    <string name="background_blur_summary">設定最近應用程式和應用程式抽屜的背景模糊度</string>
+
+    <!-- Suggestions -->
+    <string name="suggestion_pref_screen_title">建議</string>
+    <string name="suggestion_pref_screen_desc">在應用程式抽屜 &amp; 主畫面上顯示建議</string>
+
+    <!-- Background opacity -->
+    <string name="background_opacity_title">背景不透明度</string>
+
+    <!-- Recents icons -->
+    <string name="recents_chips_title">使用緊湊設計的操作按鈕圖示</string>
+    <string name="recents_chips_summary">在顯示較多操作按鈕時可能需要</string>
+    <string name="recents_screenshot_title">螢幕截圖</string>
+    <string name="recents_clear_all_title">全部清除</string>
+    <string name="recents_lens_title">智慧鏡頭</string>
+
+    <!-- AppInfo -->
+    <string name="app_info_source">來源</string>
+    <string name="app_info_source_unknown">未知</string>
+    <string name="app_info_last_update">上次更新</string>
+    <string name="app_info_version">版本</string>
+    <string name="app_info_more">更多</string>
+
+    <!-- Kill App recents action shortcut -->
+    <string name="recent_task_option_kill_app">強制關閉</string>
+    <string name="recents_app_killed">應用程式已強制關閉</string>
+
+    <!-- Memory info -->
+    <string name="meminfo_text">%1$s 可用 | %2$s</string>
+    <string name="recents_meminfo_title">記憶體資訊</string>
+
+    <!-- App drawer searchbar -->
+    <string name="drawer_search_title">應用程式搜尋欄</string>
+    <string name="drawer_search_summary">Search bar on top of the app drawer</string>
+
+    <!-- Restart launcher -->
+    <string name="pref_restart_title">重新啟動</string>
+    <string name="pref_restart_summary">Restart the DerpLauncher manually to apply any pending settings</string>
+    <string name="restarting_launcher">正在重新啟動 DerpLauncher...</string>
+    <string name="restarting_launcher_changes">Restarting DerpLauncher to apply changes...</string>
+    <string name="updating_launcher_components">Restarting DerpLauncher to update components...</string>
+
+    <!-- Shake Clear Recents -->
+    <string name="recents_shake_clear_all_title">Shake phone to clear all tasks</string>
+
+    <!-- Parallax -->
+    <string name="short_parallax_title">Allow short parallax</string>
+    <string name="short_parallax_summary">Enable full wallpaper scroll effect on smaller numbers of pages instead of cropping the wallpaper</string>
+    <string name="single_page_center_title">Single page center</string>
+    <string name="single_page_center_summary">Center wallpaper if only using a single page</string>
+
+    <!-- Icon pack -->
+    <string name="icon_pack_title">圖示包</string>
+    <string name="icon_pack_default_label">預設</string>
+    <string name="icon_pack_add">安裝更多</string>
+    <string name="icon_pack_no_market">沒有可用的應用程式商店</string>
+
+    <!-- About info -->
+    <string name="about_app_subtitle">基於 AOSP Launcher3</string>
+    <string name="about_thanks_cat">特別感謝</string>
+    <string name="about">關於</string>
+    <string name="about_summary">關於 DerpLauncher 的資訊</string>
+
+    <!-- Trust apps -->
+    <string name="trust_apps_manager_name">隱藏 &amp; 受保護的應用程式</string>
+    <string name="trust_apps_auth_manager">解鎖後即可管理隱藏和受保護的應用程式</string>
+    <string name="trust_apps_auth_open_app">進行身份驗證後即可開啟 %1$s</string>
+    <string name="trust_apps_loading">載入中\u2026</string>
+    <string name="trust_apps_no_lock_error">Please set up a secure lock screen to restrict app access</string>
+    <string name="trust_apps_help">說明</string>
+    <string name="trust_apps_info_hidden">Hidden apps and their widgets are hidden from the drawer</string>
+    <string name="trust_apps_info_protected">Protected apps require authentication to be opened from the launcher</string>
+
+    <!-- All apps themed icons -->
+    <string name="pref_themed_icons_title">主題圖示</string>
+    <string name="pref_themed_icons_summary">Follow themed icons used on home screen</string>
+
+    <!-- Dark Status Bar -->
+    <string name="perf_dark_status_bar_title">深色狀態列</string>
+    <string name="perf_dark_status_bar_summary">在主畫面上使用深色狀態列</string>
+
+    <!-- Force monocrome icons -->
+    <string name="pref_force_mono_icons_title">強制使用單色圖示</string>
+    <string name="pref_force_mono_icons_summary">Force monochrome icons for apps that don\'t support them natively (requires re-toggling of themed icons)</string>
+
+    <!-- QuickSpace -->
+    <string name="show_quickspace_title">快速查看</string>
+    <string name="show_quickspace_summary">在主畫面頂部上顯示</string>
+
+    <!-- QuickSpace: QuickEvent: Device Intro Event -->
+    <string name="quick_event_rom_intro_welcome">歡迎來到 DerpFest！</string>
+    <string name="quick_event_rom_intro_welcome_ext">DerpFest 時間！</string>
+    <string-array name="welcome_message_variants">
+        <item>感謝你選擇我們</item>
+        <item>有史以來最好的 ROM</item>
+        <item>來我們的 Telegram 群組上 Say hi 吧！</item>
+        <item>輕觸此處開始</item>
+        <item>我們愛你 3000 次</item>
+        <item>DerpFest 萬歲！</item>
+        <item>#StayDerped</item>
+    </string-array>
+
+    <!-- QuickSpace: QuickEvent: Greetings -->
+    <string name="quickspace_grt_morning">早安</string>
+    <string name="quickspace_grt_evening">晚安</string>
+    <string name="quickspace_grt_afternoon">午安</string>
+    <string name="quickspace_grt_night">晚安</string>
+    <string name="quickspace_grt_general">你好</string>
+    <string name="quickspace_ext_one">今天是</string>
+    <string name="quickspace_ext_two">現在是</string>
+
+    <!-- QuickSpace: QuickEvent: Ambient Play -->
+    <string name="qe_now_playing_unknown_artist">未知藝術家</string>
+    <string name="qe_now_playing_ext_one">正在播放</string>
+    <string name="qe_now_playing_by">作者</string>
+
+    <!-- Quickspace Now Playing -->
+    <string name="quickspace_now_playing_title">正在播放</string>
+    <string name="quickspace_now_playing_summary">Show the song you\'re playing</string>
+
+    <!-- Quickspace alternative view -->
+    <string name="quickspace_alternate_style_title">Extended style</string>
+    <string name="quickspace_alternate_style_summary">Switch to extended style</string>
+
+    <!-- Quickspace PSA - Custom messages for the glance -->
+    <string name="quickspace_psa_title">隨機訊息</string>
+    <string name="quickspace_psa_summary">Make your companion more lively with random messages</string>
+
+    <string-array name="quickspace_psa_morning">
+        <item>Good morning!</item>
+        <item>Good morning, time to rock!</item>
+        <item>What a beautiful day!</item>
+        <item>Have a nice day!</item>
+        <item>What about a small 5 minutes nap?</item>
+        <item>Let\'s get this bread.</item>
+        <item>Mornings are a fresh canvas for your daily masterpiece.</item>
+        <item>Embrace the sunrise of opportunity each morning.</item>
+        <item>In the early light, find the power to illuminate your path.</item>
+        <item>Your day begins with endless possibilities.</item>
+        <item>Every sunrise is a reminder that you can start anew.</item>
+        <item>Awake with purpose, conquer the day ahead.</item>
+        <item>Your thoughts can be the foundation of great achievements.</item>
+        <item>The world awakens, and so does your potential.</item>
+        <item>The first chapter in your daily adventure.</item>
+        <item>Let your morning routine be the launchpad for success.</item>
+        <item>Sunrise or not, your potential is always on the rise.</item>
+        <item>It\'s time for fresh ideas and bold actions.</item>
+        <item>The early bird catches the worm, but you can catch your dreams.</item>
+        <item>Find the courage to chase your aspirations.</item>
+        <item>Rise and shine, for greatness awaits.</item>
+        <item>The best time to start is now.</item>
+    </string-array>
+    <string-array name="quickspace_psa_noon">
+        <item>Chase your dreams, not your fears.</item>
+        <item>In every moment, a new opportunity appears.</item>
+        <item>Embrace the journey, not just the destination.</item>
+        <item>Today is a gift, that\'s why it\'s called the present.</item>
+        <item>Let your smile change the world.</item>
+        <item>Life is a story, make each chapter count.</item>
+        <item>Find joy in every moments.</item>
+        <item>The best is yet to come, keep it up.</item>
+        <item>Your chance to turn \'what if\' into \'how about that\'</item>
+        <item>Seize the day, starting right now.</item>
+        <item>Happiness is a choice you can make any time.</item>
+        <item>Believe in yourself, even on a sleepy afternoon.</item>
+        <item>Let your actions speak louder than the clock.</item>
+        <item>Your life is yours, not your parents nor your friends.</item>
+        <item>Dream big, work hard, and never give up.</item>
+        <item>You are stronger than you think.</item>
+        <item>Every failure means a step closer to your success.</item>
+        <item>Your potential is endless, unlock it.</item>
+    </string-array>
+    <string-array name="quickspace_psa_early_evening">
+        <item>Embrace the present moment, no matter the hour.</item>
+        <item>In every dusk, find a new dawn of opportunity.</item>
+        <item>Life is a journey, enjoy the scenery along the way.</item>
+        <item>Your attitude shapes your reality.</item>
+        <item>Your story is still being written, even as the sun sets.</item>
+        <item>Capture the beauty in the ordinary moments.</item>
+        <item>It\'s time to reflect and reset.</item>
+        <item>Choose joy, no matter the time on the clock.</item>
+        <item>Opportunities don\'t clock out in the evening.</item>
+        <item>Be the reason someone smiles.</item>
+        <item>Your potential knows no bounds.</item>
+        <item>Moments of magic can happen at any hour.</item>
+        <item>Your life is what you make of it, make it extraordinary.</item>
+        <item>Stay curious, stay grateful.</item>
+        <item>Be the change you wish to see in the world.</item>
+        <item>Believe in yourself, you are capable of amazing things.</item>
+        <item>The only limit is the one you set for yourself.</item>
+        <item>Success begins with a single step.</item>
+    </string-array>
+    <string-array name="quickspace_psa_evening">
+        <item>Seize the night, for it holds its own mysteries.</item>
+        <item>In the quiet of the this evening, find serenity.</item>
+        <item>Life\'s greatest adventures can start in the darkness.</item>
+        <item>Your journey continues even after the sun has set.</item>
+        <item>Let the night be your canvas, paint it with dreams.</item>
+        <item>In the stillness of this evening, find your inner peace.</item>
+        <item>Stars shine brightest in the darkest hours.</item>
+        <item>Dream big, even in the late hours of the day.</item>
+        <item>Your life is a story waiting to be written.</item>
+        <item>It\'s time for reflection and renewal.</item>
+        <item>Late night thoughts can lead to early morning revelations.</item>
+        <item>Find joy in the stillness of this evening.</item>
+        <item>The night sky is a vast canvas of dreams.</item>
+        <item>Your potential knows no bedtime, pursue your passions.</item>
+        <item>Stay hopeful, even in the darkest hours.</item>
+        <item>In the midst of chaos, find your inner calm.</item>
+        <item>Stay positive, work hard, make it happen.</item>
+    </string-array>
+    <string-array name="quickspace_psa_midnight">
+        <item>Nights are the quiet whispers of opportunity.</item>
+        <item>In the stillness of the night, find your inner strength.</item>
+        <item>Embrace the darkness, for it holds the keys to your dreams.</item>
+        <item>The world sleeps, but your potential is wide awake.</item>
+        <item>The night may be late, but your ambitions are timeless.</item>
+        <item>Stay curious, stay awake, and let nights guide you.</item>
+        <item>Find the courage to chase your dreams.</item>
+        <item>Great things never come from comfort zones.</item>
+        <item>You have the power to create your own destiny.</item>
+        <item>Happiness is a choice, choose it every day.</item>
+        <item>Life is what you make it, so make it count.</item>
+        <item>Stay focused, stay determined, stay unstoppable.</item>
+        <item>You are the author of your own story.</item>
+        <item>Strive for progress, not perfection.</item>
+        <item>Every day is a new beginning, make it a great one.</item>
+        <item>Inspire others by being your authentic self.</item>
+        <item>Your attitude determines your direction.</item>
+    </string-array>
+    <string-array name="quickspace_psa_random">
+        <item>Is it time to flash another update already?</item>
+        <item>Make peace, not war</item>
+        <item>Oh hey, what\'s up?</item>
+        <item>Focus on your tasks</item>
+        <item>How many screenshots do you take?</item>
+        <item>Open goodness with DerpFest</item>
+        <item>Spread love, not havoc</item>
+        <item>We didn\'t start the fire!</item>
+        <item>Time for some good music</item>
+        <item>\u003C\u003C\u003C\u003C\u003C\u003C\u003C HEAD</item>
+        <item>You need DerpFest Premium to see this</item>
+        <item>Remember the Lineage of the Unicorn</item>
+        <item>Starting from the ground zero</item>
+        <item>We love you 3000</item>
+        <item>Delicious even without Sushi</item>
+        <item>Do something nice today</item>
+        <item>This is best Pixel Experience, isn\'t it?</item>
+        <item>No illusions, welcome to reality!</item>
+        <item>Thank you for your support</item>
+        <item>Is your device derped?</item>
+        <item>One of the buildbot\'s best picks</item>
+        <item>Sanity for your Paranoia</item>
+        <item>Try Ice Cold desserts</item>
+        <item>What a lovely experience, isn\'t it?</item>
+        <item>DerpFest is a myth, right?</item>
+        <item>You are what you flash, don\'t be Potato</item>
+        <item>What\'s on your mind?</item>
+        <item>Expecto Patronum</item>
+        <item>Wubba Lubba Dub Dub</item>
+        <item>Winner Winner ....?</item>
+        <item>rm -rf \/</item>
+        <item>Pringles aren\'t actually potato chips..</item>
+        <item>Remember to check device\'s battery level!</item>
+        <item>Check your email/messages.</item>
+        <item>Check your to-do list if you have one.</item>
+        <item>You can disable quickspace via home settings.</item>
+        <item>#StayDerped \m/</item>
+        <item>DerpFest FTW \m/</item>
+        <item>Enjoying Android 14?</item>
+        <item>Hyped about Android 15?</item>
+        <item>Proudly presented without donations</item>
+        <item>Did you checkout all the tweaks?</item>
+        <item>You have tapped almost a 100k times.</item>
+        <item>Lots of options!</item>
+        <item>I am not your F1 button</item>
+        <item>Don\'t pass me!</item>
+        <item>Did you finish your homework? ツ</item>
+        <item>This is best ROM Experience, isn\'t it?</item>
+        <item>Well done! You have earned a bonus feature</item>
+        <item>That\'s enough, stop tapping me!</item>
+        <item>Only for pro users</item>
+        <item>Got an issue? Don\'t forget a logcat</item>
+    </string-array>
+
+    <!-- QuickSpace: QuickEvent: Weather -->
+    <string name="quick_event_ambient_weather_title">天氣更新</string>
+    <string name="quick_event_ambient_weather_summary">顯示目前的天氣更新</string>
+    <string name="quick_event_ambient_weather_enabled_info">需要啟用天氣服務</string>
+    <string name="quick_event_weather_clouds">Cloudy</string>
+    <string name="quick_event_weather_rain">Rainy</string>
+    <string name="quick_event_weather_clear">Sunny</string>
+    <string name="quick_event_weather_storm">Stormy</string>
+    <string name="quick_event_weather_snow">Snowy</string>
+    <string name="quick_event_weather_wind">Windy</string>
+    <string name="quick_event_weather_mist">Misty</string>
+    <string name="quick_event_weather_city_title">目前位置</string>
+    <string name="quick_event_weather_city_summary">顯示目前天氣位置</string>
+    <string name="quick_event_weather_text_title">Current condition</string>
+    <string name="quick_event_weather_text_summary">Display current weather condition summary</string>
+
+    <string name="intent_no_app_clock_found">Unable to find calendar or clock activity</string>
+
+    <!-- Weather -->
+    <string name="weather_settings_title">天氣設定</string>
+    <string name="weather_settings_summary">設定圖示包和天氣服務</string>
+</resources>
diff --git a/res/values/derp_config.xml b/res/values/derp_config.xml
index 7a30e19cab3..596c83a5055 100644
--- a/res/values/derp_config.xml
+++ b/res/values/derp_config.xml
@@ -32,4 +32,7 @@
     <!-- Sort sections of apps list, in case AlphabeticIndex (of current locale)
          returns duplicate labels for some reasons. -->
     <bool name="config_appsListSortSections">false</bool>
+
+    <!-- Quickspace -->
+    <item type="id" name="reserved_container_workspace" />
 </resources>
diff --git a/res/values/derp_dimens.xml b/res/values/derp_dimens.xml
index ccc2faa22c4..62b97566d3b 100644
--- a/res/values/derp_dimens.xml
+++ b/res/values/derp_dimens.xml
@@ -12,4 +12,10 @@
     <dimen name="meminfo_bottom_margin_transient_taskbar">96dp</dimen>
     <dimen name="meminfo_bottom_margin_three_button">15dp</dimen>
     <dimen name="meminfo_top_margin">12dp</dimen>
+
+    <!-- QuickSpace -->
+    <dimen name="quickspace_title_size">20sp</dimen>
+    <dimen name="quickspace_subtitle_size">16sp</dimen>
+    <dimen name="quickspace_alternate_title_size">18sp</dimen>
+    <dimen name="quickspace_alternate_subtitle_size">14sp</dimen>
 </resources>
diff --git a/res/values/derp_strings.xml b/res/values/derp_strings.xml
index 3f0af120ff1..b39e3593b8f 100644
--- a/res/values/derp_strings.xml
+++ b/res/values/derp_strings.xml
@@ -27,6 +27,7 @@
     <string name="misc_category_summary">Other options</string>
     <string name="general_category_title">General</string>
     <string name="interface_category_title">Interface</string>
+    <string name="quickspace_category_title">Quickspace</string>
     <string name="search_bar_category_title">Search bar</string>
     <string name="actions_category_title">Quick actions</string>
 
@@ -166,7 +167,7 @@
     <!-- About info -->
     <string name="about_app_title" translatable="false">DerpLauncher</string>
     <string name="about_app_subtitle">Based on AOSP Launcher3</string>
-    <string name="about_app_version">AP1A.240305.019</string>
+    <string name="about_app_version" translatable="false">AP1A.240405.002</string>
     <string name="about_thanks_cat">Special thanks to</string>
     <string name="about">About</string>
     <string name="about_summary">Info about the DerpLauncher</string>
@@ -192,4 +193,228 @@
     <!-- Force monocrome icons -->
     <string name="pref_force_mono_icons_title">Force monochrome icons</string>
     <string name="pref_force_mono_icons_summary">Force monochrome icons for apps that don\'t support them natively (requires re-toggling of themed icons)</string>
+
+    <!-- QuickSpace -->
+    <string name="show_quickspace_title">At A Glance</string>
+    <string name="show_quickspace_summary">Show at the top of your home screen</string>
+    <string name="quickspace_date_format" translatable="false">EEE, MMM d</string>
+    <string name="quickspace_date_format_minimalistic" translatable="false">EEEE, MMMM d</string>
+
+    <!-- QuickSpace: QuickEvent: Device Intro Event -->
+    <string name="quick_event_rom_intro_welcome">Welcome to DerpFest!</string>
+    <string name="quick_event_rom_intro_welcome_ext">DerpFest time!</string>
+    <string-array name="welcome_message_variants">
+        <item>Thank you for choosing us</item>
+        <item>Best Rom Ever.</item>
+        <item>Say hi to us on Telegram</item>
+        <item>Tap here to begin</item>
+        <item>We love you 3000</item>
+        <item>DerpFest FTW!</item>
+        <item>#StayDerped</item>
+    </string-array>
+
+    <!-- QuickSpace: QuickEvent: Greetings -->
+    <string name="quickspace_grt_morning">Good morning.</string>
+    <string name="quickspace_grt_evening">Good evening.</string>
+    <string name="quickspace_grt_afternoon">Good afternoon.</string>
+    <string name="quickspace_grt_night">Good night.</string>
+    <string name="quickspace_grt_general">Good day.</string>
+    <string name="quickspace_ext_one">Today is</string>
+    <string name="quickspace_ext_two">It\'s</string>
+
+    <!-- QuickSpace: QuickEvent: Ambient Play -->
+    <string name="qe_now_playing_unknown_artist">Unknown Artist</string>
+    <string name="qe_now_playing_ext_one">Now playing</string>
+    <string name="qe_now_playing_by">By</string>
+
+    <!-- Quickspace Now Playing -->
+    <string name="quickspace_now_playing_title">Now playing</string>
+    <string name="quickspace_now_playing_summary">Show the song you\'re playing</string>
+
+    <!-- Quickspace alternative view -->
+    <string name="quickspace_alternate_style_title">Extended style</string>
+    <string name="quickspace_alternate_style_summary">Switch to extended style</string>
+
+    <!-- Quickspace PSA - Custom messages for the glance -->
+    <string name="quickspace_psa_title">Random messages</string>
+    <string name="quickspace_psa_summary">Make your companion more lively with random messages</string>
+
+    <string-array name="quickspace_psa_morning">
+        <item>Good morning!</item>
+        <item>Good morning, time to rock!</item>
+        <item>What a beautiful day!</item>
+        <item>Have a nice day!</item>
+        <item>What about a small 5 minutes nap?</item>
+        <item>Let\'s get this bread.</item>
+        <item>Mornings are a fresh canvas for your daily masterpiece.</item>
+        <item>Embrace the sunrise of opportunity each morning.</item>
+        <item>In the early light, find the power to illuminate your path.</item>
+        <item>Your day begins with endless possibilities.</item>
+        <item>Every sunrise is a reminder that you can start anew.</item>
+        <item>Awake with purpose, conquer the day ahead.</item>
+        <item>Your thoughts can be the foundation of great achievements.</item>
+        <item>The world awakens, and so does your potential.</item>
+        <item>The first chapter in your daily adventure.</item>
+        <item>Let your morning routine be the launchpad for success.</item>
+        <item>Sunrise or not, your potential is always on the rise.</item>
+        <item>It\'s time for fresh ideas and bold actions.</item>
+        <item>The early bird catches the worm, but you can catch your dreams.</item>
+        <item>Find the courage to chase your aspirations.</item>
+        <item>Rise and shine, for greatness awaits.</item>
+        <item>The best time to start is now.</item>
+    </string-array>
+    <string-array name="quickspace_psa_noon">
+        <item>Chase your dreams, not your fears.</item>
+        <item>In every moment, a new opportunity appears.</item>
+        <item>Embrace the journey, not just the destination.</item>
+        <item>Today is a gift, that\'s why it\'s called the present.</item>
+        <item>Let your smile change the world.</item>
+        <item>Life is a story, make each chapter count.</item>
+        <item>Find joy in every moments.</item>
+        <item>The best is yet to come, keep it up.</item>
+        <item>Your chance to turn \'what if\' into \'how about that\'</item>
+        <item>Seize the day, starting right now.</item>
+        <item>Happiness is a choice you can make any time.</item>
+        <item>Believe in yourself, even on a sleepy afternoon.</item>
+        <item>Let your actions speak louder than the clock.</item>
+        <item>Your life is yours, not your parents nor your friends.</item>
+        <item>Dream big, work hard, and never give up.</item>
+        <item>You are stronger than you think.</item>
+        <item>Every failure means a step closer to your success.</item>
+        <item>Your potential is endless, unlock it.</item>
+    </string-array>
+    <string-array name="quickspace_psa_early_evening">
+        <item>Embrace the present moment, no matter the hour.</item>
+        <item>In every dusk, find a new dawn of opportunity.</item>
+        <item>Life is a journey, enjoy the scenery along the way.</item>
+        <item>Your attitude shapes your reality.</item>
+        <item>Your story is still being written, even as the sun sets.</item>
+        <item>Capture the beauty in the ordinary moments.</item>
+        <item>It\'s time to reflect and reset.</item>
+        <item>Choose joy, no matter the time on the clock.</item>
+        <item>Opportunities don\'t clock out in the evening.</item>
+        <item>Be the reason someone smiles.</item>
+        <item>Your potential knows no bounds.</item>
+        <item>Moments of magic can happen at any hour.</item>
+        <item>Your life is what you make of it, make it extraordinary.</item>
+        <item>Stay curious, stay grateful.</item>
+        <item>Be the change you wish to see in the world.</item>
+        <item>Believe in yourself, you are capable of amazing things.</item>
+        <item>The only limit is the one you set for yourself.</item>
+        <item>Success begins with a single step.</item>
+    </string-array>
+    <string-array name="quickspace_psa_evening">
+        <item>Seize the night, for it holds its own mysteries.</item>
+        <item>In the quiet of the this evening, find serenity.</item>
+        <item>Life\'s greatest adventures can start in the darkness.</item>
+        <item>Your journey continues even after the sun has set.</item>
+        <item>Let the night be your canvas, paint it with dreams.</item>
+        <item>In the stillness of this evening, find your inner peace.</item>
+        <item>Stars shine brightest in the darkest hours.</item>
+        <item>Dream big, even in the late hours of the day.</item>
+        <item>Your life is a story waiting to be written.</item>
+        <item>It\'s time for reflection and renewal.</item>
+        <item>Late night thoughts can lead to early morning revelations.</item>
+        <item>Find joy in the stillness of this evening.</item>
+        <item>The night sky is a vast canvas of dreams.</item>
+        <item>Your potential knows no bedtime, pursue your passions.</item>
+        <item>Stay hopeful, even in the darkest hours.</item>
+        <item>In the midst of chaos, find your inner calm.</item>
+        <item>Stay positive, work hard, make it happen.</item>
+    </string-array>
+    <string-array name="quickspace_psa_midnight">
+        <item>Nights are the quiet whispers of opportunity.</item>
+        <item>In the stillness of the night, find your inner strength.</item>
+        <item>Embrace the darkness, for it holds the keys to your dreams.</item>
+        <item>The world sleeps, but your potential is wide awake.</item>
+        <item>The night may be late, but your ambitions are timeless.</item>
+        <item>Stay curious, stay awake, and let nights guide you.</item>
+        <item>Find the courage to chase your dreams.</item>
+        <item>Great things never come from comfort zones.</item>
+        <item>You have the power to create your own destiny.</item>
+        <item>Happiness is a choice, choose it every day.</item>
+        <item>Life is what you make it, so make it count.</item>
+        <item>Stay focused, stay determined, stay unstoppable.</item>
+        <item>You are the author of your own story.</item>
+        <item>Strive for progress, not perfection.</item>
+        <item>Every day is a new beginning, make it a great one.</item>
+        <item>Inspire others by being your authentic self.</item>
+        <item>Your attitude determines your direction.</item>
+    </string-array>
+    <string-array name="quickspace_psa_random">
+        <item>Is it time to flash another update already?</item>
+        <item>Make peace, not war</item>
+        <item>Oh hey, what\'s up?</item>
+        <item>Focus on your tasks</item>
+        <item>How many screenshots do you take?</item>
+        <item>Open goodness with DerpFest</item>
+        <item>Spread love, not havoc</item>
+        <item>We didn\'t start the fire!</item>
+        <item>Time for some good music</item>
+        <item>\u003C\u003C\u003C\u003C\u003C\u003C\u003C HEAD</item>
+        <item>You need DerpFest Premium to see this</item>
+        <item>Remember the Lineage of the Unicorn</item>
+        <item>Starting from the ground zero</item>
+        <item>We love you 3000</item>
+        <item>Delicious even without Sushi</item>
+        <item>Do something nice today</item>
+        <item>This is best Pixel Experience, isn\'t it?</item>
+        <item>No illusions, welcome to reality!</item>
+        <item>Thank you for your support</item>
+        <item>Is your device derped?</item>
+        <item>One of the buildbot\'s best picks</item>
+        <item>Sanity for your Paranoia</item>
+        <item>Try Ice Cold desserts</item>
+        <item>What a lovely experience, isn\'t it?</item>
+        <item>DerpFest is a myth, right?</item>
+        <item>You are what you flash, don\'t be Potato</item>
+        <item>What\'s on your mind?</item>
+        <item>Expecto Patronum</item>
+        <item>Wubba Lubba Dub Dub</item>
+        <item>Winner Winner ....?</item>
+        <item>rm -rf \/</item>
+        <item>Pringles aren\'t actually potato chips..</item>
+        <item>Remember to check device\'s battery level!</item>
+        <item>Check your email/messages.</item>
+        <item>Check your to-do list if you have one.</item>
+        <item>You can disable quickspace via home settings.</item>
+        <item>#StayDerped \m/</item>
+        <item>DerpFest FTW \m/</item>
+        <item>Enjoying Android 14?</item>
+        <item>Hyped about Android 15?</item>
+        <item>Proudly presented without donations</item>
+        <item>Did you checkout all the tweaks?</item>
+        <item>You have tapped almost a 100k times.</item>
+        <item>Lots of options!</item>
+        <item>I am not your F1 button</item>
+        <item>Don\'t pass me!</item>
+        <item>Did you finish your homework? ツ</item>
+        <item>This is best ROM Experience, isn\'t it?</item>
+        <item>Well done! You have earned a bonus feature</item>
+        <item>That\'s enough, stop tapping me!</item>
+        <item>Only for pro users</item>
+        <item>Got an issue? Don\'t forget a logcat</item>
+    </string-array>
+
+    <!-- QuickSpace: QuickEvent: Weather -->
+    <string name="quick_event_ambient_weather_title">Weather update</string>
+    <string name="quick_event_ambient_weather_summary">Display current weather update</string>
+    <string name="quick_event_ambient_weather_enabled_info">Requires weather service to be enabled</string>
+    <string name="quick_event_weather_clouds">Cloudy</string>
+    <string name="quick_event_weather_rain">Rainy</string>
+    <string name="quick_event_weather_clear">Sunny</string>
+    <string name="quick_event_weather_storm">Stormy</string>
+    <string name="quick_event_weather_snow">Snowy</string>
+    <string name="quick_event_weather_wind">Windy</string>
+    <string name="quick_event_weather_mist">Misty</string>
+    <string name="quick_event_weather_city_title">Current location</string>
+    <string name="quick_event_weather_city_summary">Display current weather location</string>
+    <string name="quick_event_weather_text_title">Current condition</string>
+    <string name="quick_event_weather_text_summary">Display current weather condition summary</string>
+
+    <string name="intent_no_app_clock_found">Unable to find calendar or clock activity</string>
+
+    <!-- Weather -->
+    <string name="weather_settings_title">Weather settings</string>
+    <string name="weather_settings_summary">Setup icon pack and weather service</string>
 </resources>
diff --git a/res/values/derp_styles.xml b/res/values/derp_styles.xml
new file mode 100644
index 00000000000..5f9725bdbec
--- /dev/null
+++ b/res/values/derp_styles.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 DerpFest
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <!-- QuickSpace -->
+    <style name="QuickSpaceText">
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+    </style>
+
+    <style name="QuickSpaceSubText">
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
+    </style>
+</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f2dc189e774..32a218af51e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -406,6 +406,8 @@
     <dimen name="taskbar_button_space_inbetween_phone">0dp</dimen>
     <dimen name="taskbar_button_margin_split">0dp</dimen>
     <dimen name="taskbar_button_margin_6_5">0dp</dimen>
+    <dimen name="taskbar_button_margin_4_5">0dp</dimen>
+    <dimen name="taskbar_button_margin_4_4">0dp</dimen>
 
     <!-- Bubble bar (placeholders to compile in Launcher3 without Quickstep) -->
     <dimen name="bubblebar_hotseat_adjustment_threshold">0dp</dimen>
diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
new file mode 100644
index 00000000000..7a743f398ad
--- /dev/null
+++ b/res/xml/default_workspace_4x4.xml
@@ -0,0 +1,135 @@
+<?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.
+-->
+
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+
+    <!-- Hotseat -->
+    <include launcher:workspace="@xml/dw_hotseat_4" />
+
+    <!-- Google folder -->
+    <folder
+        launcher:title="@string/google_folder_title"
+        launcher:screen="0"
+        launcher:x="0"
+        launcher:y="-1">
+        <favorite
+            launcher:packageName="com.google.android.googlequicksearchbox"
+            launcher:className="com.google.android.googlequicksearchbox.SearchActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.gm"
+            launcher:className="com.google.android.gm.ConversationListActivityGmail"/>
+        <favorite
+            launcher:packageName="com.google.android.apps.maps"
+            launcher:className="com.google.android.maps.MapsActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.youtube"
+            launcher:className="com.google.android.youtube.app.honeycomb.Shell$HomeActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.apps.docs"
+            launcher:className="com.google.android.apps.docs.app.NewMainProxyActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.apps.youtube.music"
+            launcher:className="com.google.android.apps.youtube.music.activities.MusicActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.videos"
+            launcher:className="com.google.android.videos.GoogleTvEntryPoint"/>
+        <favorite
+            launcher:packageName="com.google.android.apps.tachyon"
+            launcher:className="com.google.android.apps.tachyon.MainActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.apps.photos"
+            launcher:className="com.google.android.apps.photos.home.HomeActivity"/>
+        <favorite
+            launcher:packageName="com.google.android.calendar"
+            launcher:className="com.android.calendar.AllInOneActivity" />
+        <favorite
+            launcher:packageName="com.google.android.apps.plus"
+            launcher:className="com.google.android.apps.plus.phone.HomeActivity" />
+        <favorite
+            launcher:packageName="com.google.android.play.games"
+            launcher:className="com.google.android.gms.games.ui.destination.main.MainActivity" />
+        <favorite
+            launcher:packageName="com.google.android.apps.books"
+            launcher:className="com.google.android.apps.books.app.BooksActivity" />
+        <favorite
+            launcher:packageName="com.google.android.apps.magazines"
+            launcher:className="com.google.apps.dots.android.app.activity.CurrentsStartActivity" />
+    </folder>
+
+    <resolve
+        launcher:screen="0"
+        launcher:x="3"
+        launcher:y="-1" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_CONTACTS;end" />
+    </resolve>
+
+    <!-- Screen 1 -->
+    <appwidget
+        launcher:packageName="org.lineageos.eleven"
+        launcher:className="org.lineageos.eleven.appwidgets.AppWidgetLarge"
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="0"
+        launcher:spanX="4"
+        launcher:spanY="2" />
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="0"
+        launcher:y="-1" >
+        <favorite
+            launcher:packageName="org.lineageos.aperture"
+            launcher:className="org.lineageos.aperture.CameraLauncher" />
+        <favorite
+            launcher:packageName="com.android.camera2"
+            launcher:className="com.android.camera.CameraActivity" />
+        <favorite
+            launcher:packageName="com.android.camera"
+            launcher:className="com.android.camera.Camera" />
+        <favorite
+            launcher:packageName="com.oneplus.camera"
+            launcher:className="com.oneplus.camera.OPCameraActivity" />
+        <favorite
+            launcher:packageName="com.oplus.camera"
+            launcher:className="com.oplus.camera.Camera" />
+        <favorite
+            launcher:packageName="com.mediatek.camera"
+            launcher:className="com.mediatek.camera.CameraLauncher" />
+    </resolve>
+
+    <resolve
+        launcher:screen="1"
+        launcher:x="1"
+        launcher:y="-1" >
+        <favorite launcher:uri="#Intent;action=android.intent.action.MAIN;category=android.intent.category.APP_GALLERY;end" />
+        <favorite launcher:uri="#Intent;type=images/*;end" />
+    </resolve>
+
+    <favorite
+        launcher:packageName="org.lineageos.eleven"
+        launcher:className="org.lineageos.eleven.ui.activities.HomeActivity"
+        launcher:screen="1"
+        launcher:x="2"
+        launcher:y="-1" />
+
+    <favorite
+        launcher:packageName="com.android.settings"
+        launcher:className="com.android.settings.Settings"
+        launcher:screen="1"
+        launcher:x="3"
+        launcher:y="-1" />
+
+</favorites>
diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml
index 9ec56fa63a8..ab9534ef3db 100644
--- a/res/xml/device_profiles.xml
+++ b/res/xml/device_profiles.xml
@@ -93,6 +93,70 @@
 
     </grid-option>
 
+    <grid-option
+        launcher:name="4_by_4"
+        launcher:numRows="4"
+        launcher:numColumns="4"
+        launcher:numFolderRows="3"
+        launcher:numFolderColumns="4"
+        launcher:numHotseatIcons="4"
+        launcher:dbFile="launcher_4_by_4.db"
+        launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_4_4"
+        launcher:defaultLayoutId="@xml/default_workspace_4x4"
+        launcher:deviceCategory="phone|multi_display" >
+
+        <display-option
+            launcher:name="Short Stubby"
+            launcher:minWidthDps="275"
+            launcher:minHeightDps="420"
+            launcher:iconImageSize="48"
+            launcher:iconTextSize="13.0"
+            launcher:allAppsBorderSpace="16"
+            launcher:allAppsCellHeight="104"
+            launcher:canBeDefault="true" />
+
+        <display-option
+            launcher:name="Stubby"
+            launcher:minWidthDps="255"
+            launcher:minHeightDps="450"
+            launcher:iconImageSize="48"
+            launcher:iconTextSize="13.0"
+            launcher:allAppsBorderSpace="16"
+            launcher:allAppsCellHeight="104"
+            launcher:canBeDefault="true" />
+
+        <display-option
+            launcher:name="Nexus S"
+            launcher:minWidthDps="296"
+            launcher:minHeightDps="491.33"
+            launcher:iconImageSize="48"
+            launcher:iconTextSize="13.0"
+            launcher:allAppsBorderSpace="16"
+            launcher:allAppsCellHeight="104"
+            launcher:canBeDefault="true" />
+
+        <display-option
+            launcher:name="Nexus 4"
+            launcher:minWidthDps="359"
+            launcher:minHeightDps="567"
+            launcher:iconImageSize="54"
+            launcher:iconTextSize="13.0"
+            launcher:allAppsBorderSpace="16"
+            launcher:allAppsCellHeight="104"
+            launcher:canBeDefault="true" />
+
+        <display-option
+            launcher:name="Nexus 5"
+            launcher:minWidthDps="335"
+            launcher:minHeightDps="567"
+            launcher:iconImageSize="54"
+            launcher:iconTextSize="13.0"
+            launcher:allAppsBorderSpace="16"
+            launcher:allAppsCellHeight="104"
+            launcher:canBeDefault="true" />
+
+    </grid-option>
+
     <grid-option
         launcher:name="4_by_5"
         launcher:numRows="5"
diff --git a/res/xml/launcher_app_drawer_preferences.xml b/res/xml/launcher_app_drawer_preferences.xml
index 2eefa914a2d..187556c46e1 100644
--- a/res/xml/launcher_app_drawer_preferences.xml
+++ b/res/xml/launcher_app_drawer_preferences.xml
@@ -65,6 +65,6 @@
         android:max="100"
         android:min="0"
         settings:units="%"
-        android:defaultValue="80" />
+        android:defaultValue="91" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/res/xml/launcher_home_screen_preferences.xml b/res/xml/launcher_home_screen_preferences.xml
index dc4ab92254e..a9e2aa22334 100644
--- a/res/xml/launcher_home_screen_preferences.xml
+++ b/res/xml/launcher_home_screen_preferences.xml
@@ -140,6 +140,82 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:title="@string/quickspace_category_title">
+
+        <SwitchPreferenceCompat
+            android:key="pref_show_quickspace"
+            android:title="@string/show_quickspace_title"
+            android:summary="@string/show_quickspace_summary"
+            android:defaultValue="true"
+            android:persistent="true"
+            launcher:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            android:key="pref_show_alt_quickspace"
+            android:title="@string/quickspace_alternate_style_title"
+            android:summary="@string/quickspace_alternate_style_summary"
+            android:dependency="pref_show_quickspace"
+            android:defaultValue="false"
+            android:persistent="true"
+            launcher:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            android:key="pref_quickspace_psonality"
+            android:title="@string/quickspace_psa_title"
+            android:summary="@string/quickspace_psa_summary"
+            android:dependency="pref_show_quickspace"
+            android:defaultValue="true"
+            android:persistent="true"
+            launcher:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            android:key="pref_quickspace_np"
+            android:title="@string/quickspace_now_playing_title"
+            android:summary="@string/quickspace_now_playing_summary"
+            android:dependency="pref_show_quickspace"
+            android:defaultValue="true"
+            android:persistent="true"
+            launcher:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            android:key="pref_quickspace_weather"
+            android:title="@string/quick_event_ambient_weather_title"
+            android:summary="@string/quick_event_ambient_weather_summary"
+            android:dependency="pref_show_quickspace"
+            android:defaultValue="true"
+            android:persistent="true"
+            launcher:iconSpaceReserved="false" />
+
+        <Preference
+            android:title="@string/weather_settings_title"
+            android:summary="@string/weather_settings_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="org.omnirom.omnijaws"
+                android:targetClass="org.omnirom.omnijaws.SettingsActivity" />
+        </Preference>
+
+        <SwitchPreferenceCompat
+            android:key="pref_quickspace_weather_text"
+            android:title="@string/quick_event_weather_text_title"
+            android:summary="@string/quick_event_weather_text_summary"
+            android:dependency="pref_quickspace_weather"
+            android:defaultValue="true"
+            android:persistent="true"
+            launcher:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            android:key="pref_quickspace_weather_city"
+            android:title="@string/quick_event_weather_city_title"
+            android:summary="@string/quick_event_weather_city_summary"
+            android:dependency="pref_quickspace_weather"
+            android:defaultValue="false"
+            android:persistent="true"
+            launcher:iconSpaceReserved="false" />
+
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:title="@string/search_bar_category_title">
 
diff --git a/res/xml/launcher_misc_preferences.xml b/res/xml/launcher_misc_preferences.xml
index cbf0b438240..2f53750a333 100644
--- a/res/xml/launcher_misc_preferences.xml
+++ b/res/xml/launcher_misc_preferences.xml
@@ -46,7 +46,7 @@
         android:title="@string/background_blur_title"
         android:summary="@string/background_blur_summary"
         android:persistent="true"
-        android:max="175"
+        android:max="225"
         android:min="0"
         settings:units="px"
         android:defaultValue="23" />
diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java
index c7cdfa8c693..9316b1473f6 100644
--- a/src/com/android/launcher3/AutoInstallsLayout.java
+++ b/src/com/android/launcher3/AutoInstallsLayout.java
@@ -50,7 +50,6 @@
 import com.android.launcher3.model.data.LauncherAppWidgetInfo;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 import com.android.launcher3.pm.UserCache;
-import com.android.launcher3.qsb.QsbContainerView;
 import com.android.launcher3.shortcuts.ShortcutKey;
 import com.android.launcher3.uioverrides.ApiWrapper;
 import com.android.launcher3.util.IntArray;
@@ -128,7 +127,6 @@ public static AutoInstallsLayout get(Context context, LauncherWidgetHolder appWi
     private static final String TAG_AUTO_INSTALL = "autoinstall";
     private static final String TAG_FOLDER = "folder";
     private static final String TAG_APPWIDGET = "appwidget";
-    protected static final String TAG_SEARCH_WIDGET = "searchwidget";
     private static final String TAG_SHORTCUT = "shortcut";
     private static final String TAG_EXTRA = "extra";
 
@@ -342,7 +340,6 @@ protected ArrayMap<String, TagParser> getLayoutElementsMap() {
         parsers.put(TAG_AUTO_INSTALL, new AutoInstallParser());
         parsers.put(TAG_FOLDER, new FolderParser());
         parsers.put(TAG_APPWIDGET, new PendingWidgetParser());
-        parsers.put(TAG_SEARCH_WIDGET, new SearchWidgetParser());
         parsers.put(TAG_SHORTCUT, new ShortcutParser());
         return parsers;
     }
@@ -534,24 +531,6 @@ protected int verifyAndInsert(ComponentName cn, Bundle extras) {
         }
     }
 
-    protected class SearchWidgetParser extends PendingWidgetParser {
-        @Override
-        @Nullable
-        @WorkerThread
-        public ComponentName getComponentName(XmlPullParser parser) {
-            return QsbContainerView.getSearchComponentName(mContext);
-        }
-
-        @Override
-        protected int verifyAndInsert(ComponentName cn, Bundle extras) {
-            mValues.put(Favorites.OPTIONS, LauncherAppWidgetInfo.OPTION_SEARCH_WIDGET);
-            int flags = mValues.getAsInteger(Favorites.RESTORED)
-                    | WorkspaceItemInfo.FLAG_RESTORE_STARTED;
-            mValues.put(Favorites.RESTORED, flags);
-            return super.verifyAndInsert(cn, extras);
-        }
-    }
-
     protected class FolderParser implements TagParser {
         private final ArrayMap<String, TagParser> mFolderElements;
 
diff --git a/src/com/android/launcher3/DefaultLayoutParser.java b/src/com/android/launcher3/DefaultLayoutParser.java
index c748693f9bd..1949c9a2c3b 100644
--- a/src/com/android/launcher3/DefaultLayoutParser.java
+++ b/src/com/android/launcher3/DefaultLayoutParser.java
@@ -70,7 +70,6 @@ protected ArrayMap<String, TagParser> getLayoutElementsMap() {
         ArrayMap<String, TagParser> parsers = new ArrayMap<>();
         parsers.put(TAG_FAVORITE, new AppShortcutWithUriParser());
         parsers.put(TAG_APPWIDGET, new AppWidgetParser());
-        parsers.put(TAG_SEARCH_WIDGET, new SearchWidgetParser());
         parsers.put(TAG_SHORTCUT, new ShortcutParser());
         parsers.put(TAG_RESOLVE, new ResolveParser());
         parsers.put(TAG_FOLDER, new MyFolderParser());
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index 76e6b826146..e0819c28a46 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -243,31 +243,6 @@ public class InvariantDeviceProfile implements OnSharedPreferenceChangeListener
 
     private final ArrayList<OnIDPChangeListener> mChangeListeners = new ArrayList<>();
 
-    private static final Uri ENABLE_TASKBAR_URI = Settings.System.getUriFor(
-            Settings.System.ENABLE_TASKBAR);
-
-    private final class SettingsContentObserver extends ContentObserver {
-        SettingsContentObserver() {
-            super(new Handler(Looper.getMainLooper()));
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            if (ENABLE_TASKBAR_URI.equals(uri)) {
-                // Create the illusion of this taking effect immediately
-                // Also needed because TaskbarManager inits before SystemUiProxy on start
-                boolean enabled = Settings.System.getInt(mContext.getContentResolver(),
-                        Settings.System.ENABLE_TASKBAR, 0) == 1;
-                SystemUiProxy.INSTANCE.get(mContext).setTaskbarEnabled(enabled);
-
-                // Restart launcher
-                System.exit(0);
-            }
-        }
-    }
-
-    private final SettingsContentObserver mSettingsObserver = new SettingsContentObserver();
-
     @VisibleForTesting
     public InvariantDeviceProfile() { }
 
@@ -293,10 +268,6 @@ private InvariantDeviceProfile(Context context) {
                         onConfigChanged(displayContext);
                     }
                 });
-
-        final ContentResolver resolver = mContext.getContentResolver();
-        resolver.registerContentObserver(ENABLE_TASKBAR_URI, false,
-                mSettingsObserver);
     }
 
     /**
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7aa8c4a9b2a..8d3bffbb4ad 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -204,7 +204,7 @@
 import com.android.launcher3.popup.ArrowPopup;
 import com.android.launcher3.popup.PopupDataProvider;
 import com.android.launcher3.popup.SystemShortcut;
-import com.android.launcher3.qsb.QsbContainerView;
+import com.android.launcher3.quickspace.QuickSpaceView;
 import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StateManager.StateHandler;
 import com.android.launcher3.statemanager.StatefulActivity;
@@ -410,6 +410,9 @@ public class Launcher extends StatefulActivity<LauncherState>
     private final SettingsCache.OnChangeListener mNaturalScrollingChangedListener =
             enabled -> mIsNaturalScrollingEnabled = enabled;
 
+    // QuickSpace
+    private QuickSpaceView mQuickSpace;
+
     public static Launcher getLauncher(Context context) {
         return fromContext(context);
     }
@@ -1050,6 +1053,9 @@ protected void onStop() {
         } else {
             mOverlayManager.onActivityStopped();
         }
+        if (mQuickSpace != null) {
+            mQuickSpace.onPause();
+        }
         hideKeyboard();
         logStopAndResume(false /* isResume */);
         mAppWidgetHolder.setActivityStarted(false);
@@ -1238,6 +1244,10 @@ protected void onResume() {
         TraceHelper.INSTANCE.beginSection(ON_RESUME_EVT);
         super.onResume();
 
+        if (mQuickSpace != null) {
+            mQuickSpace.onResume();
+        }
+
         if (mDeferOverlayCallbacks) {
             scheduleDeferredCheck();
         } else {
@@ -1263,6 +1273,9 @@ protected void onPause() {
         if (!mDeferOverlayCallbacks) {
             mOverlayManager.onActivityPaused();
         }
+        if (mQuickSpace != null) {
+            mQuickSpace.onPause();
+        }
         mAppWidgetHolder.setActivityResumed(false);
     }
 
@@ -1346,6 +1359,9 @@ protected void setupViews() {
         // Setup Scrim
         mScrimView = findViewById(R.id.scrim_view);
 
+        // QuickSpace
+        mQuickSpace = findViewById(R.id.reserved_container_workspace);
+
         // Setup the drag controller (drop targets have to be added in reverse order in priority)
         mDropTargetBar.setup(mDragController);
         mAllAppsController.setupViews(mScrimView, mAppsView);
@@ -1746,6 +1762,10 @@ public void onDestroy() {
         // changes while launcher is still loading.
         getRootView().getViewTreeObserver().removeOnPreDrawListener(mOnInitialBindListener);
         mOverlayManager.onActivityDestroyed();
+        
+        if (mQuickSpace != null) {
+            mQuickSpace.onPause();
+        }
     }
 
     public LauncherAccessibilityDelegate getAccessibilityDelegate() {
@@ -2315,14 +2335,6 @@ public void bindAppWidget(LauncherAppWidgetInfo item) {
     }
 
     private View inflateAppWidget(LauncherAppWidgetInfo item) {
-        if (item.hasOptionFlag(LauncherAppWidgetInfo.OPTION_SEARCH_WIDGET)) {
-            item.providerName = QsbContainerView.getSearchComponentName(this);
-            if (item.providerName == null) {
-                getModelWriter().deleteItemFromDatabase(item,
-                        "search widget removed because search component cannot be found");
-                return null;
-            }
-        }
         final AppWidgetHostView view;
         if (mIsSafeModeEnabled) {
             view = new PendingAppWidgetHostView(this, item, mIconCache, true);
diff --git a/src/com/android/launcher3/ModelCallbacks.kt b/src/com/android/launcher3/ModelCallbacks.kt
index 51729992d45..ac6552df358 100644
--- a/src/com/android/launcher3/ModelCallbacks.kt
+++ b/src/com/android/launcher3/ModelCallbacks.kt
@@ -35,8 +35,7 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks {
     var synchronouslyBoundPages = LIntSet()
     var pagesToBindSynchronously = LIntSet()
 
-    private var isFirstPagePinnedItemEnabled =
-        (BuildConfig.QSB_ON_FIRST_SCREEN && !FeatureFlags.ENABLE_SMARTSPACE_REMOVAL.get())
+    private var isFirstPagePinnedItemEnabled = FeatureFlags.USE_QUICKSPACE_VIEW
 
     var stringCache: StringCache? = null
 
@@ -309,15 +308,14 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks {
         )
         val firstScreenPosition = 0
         if (
-            (FeatureFlags.QSB_ON_FIRST_SCREEN &&
-                isFirstPagePinnedItemEnabled &&
+            (isFirstPagePinnedItemEnabled &&
                 !shouldShowFirstPageWidget()) &&
                 orderedScreenIds.indexOf(FIRST_SCREEN_ID) != firstScreenPosition
         ) {
             orderedScreenIds.removeValue(FIRST_SCREEN_ID)
             orderedScreenIds.add(firstScreenPosition, FIRST_SCREEN_ID)
         } else if (
-            (!FeatureFlags.QSB_ON_FIRST_SCREEN && !isFirstPagePinnedItemEnabled ||
+            (!isFirstPagePinnedItemEnabled ||
                 shouldShowFirstPageWidget()) && orderedScreenIds.isEmpty
         ) {
             // If there are no screens, we need to have an empty screen
@@ -374,8 +372,7 @@ class ModelCallbacks(private var launcher: Launcher) : BgDataModel.Callbacks {
         }
         orderedScreenIds
             .filterNot { screenId ->
-                FeatureFlags.QSB_ON_FIRST_SCREEN &&
-                    isFirstPagePinnedItemEnabled &&
+                isFirstPagePinnedItemEnabled &&
                     !FeatureFlags.shouldShowFirstPageWidget() &&
                     screenId == WorkspaceLayoutManager.FIRST_SCREEN_ID
             }
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index bbbe984c724..e65efac70d9 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -58,6 +58,8 @@
 import android.graphics.drawable.InsetDrawable;
 import android.hardware.biometrics.BiometricManager.Authenticators;
 import android.hardware.biometrics.BiometricPrompt;
+import android.icu.text.DateFormat;
+import android.icu.text.DisplayContext;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.CancellationSignal;
@@ -69,6 +71,7 @@
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.format.DateUtils;
 import android.text.style.TtsSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -197,6 +200,14 @@ public final class Utilities {
     public static final String KEY_LENS = "pref_recents_lens";
     public static final String KEY_SHORT_PARALLAX = "pref_short_parallax";
     public static final String KEY_SINGLE_PAGE_CENTER = "pref_single_page_center";
+    public static final String KEY_RECENTS_CHIPS = "pref_recents_chips";
+    public static final String DESKTOP_SHOW_QUICKSPACE = "pref_show_quickspace";
+    public static final String KEY_SHOW_ALT_QUICKSPACE = "pref_show_alt_quickspace";
+    public static final String KEY_SHOW_QUICKSPACE_PSONALITY = "pref_quickspace_psonality";
+    public static final String KEY_SHOW_QUICKSPACE_NOWPLAYING = "pref_quickspace_np";
+    public static final String KEY_SHOW_QUICKSPACE_WEATHER = "pref_quickspace_weather";
+    public static final String KEY_SHOW_QUICKSPACE_WEATHER_CITY = "pref_quickspace_weather_city";
+    public static final String KEY_SHOW_QUICKSPACE_WEATHER_TEXT = "pref_quickspace_weather_text";
 
     /**
      * Returns true if theme is dark.
@@ -879,6 +890,19 @@ public static void translateOverlappingView(
         }
     }
 
+    public static String formatDateTime(Context context) {
+        String styleText;
+        DateFormat dateFormat;
+        if (useAlternativeQuickspaceUI(context)) {
+            styleText = context.getString(R.string.quickspace_date_format_minimalistic);
+        } else {
+            styleText = context.getString(R.string.quickspace_date_format);
+        }
+        dateFormat = DateFormat.getInstanceForSkeleton(styleText, Locale.getDefault());
+        dateFormat.setContext(DisplayContext.CAPITALIZATION_FOR_STANDALONE);
+        return dateFormat.format(System.currentTimeMillis());
+    }
+
     public static boolean isWorkspaceEditAllowed(Context context) {
         SharedPreferences prefs = LauncherPrefs.getPrefs(context.getApplicationContext());
         return !prefs.getBoolean(InvariantDeviceProfile.KEY_WORKSPACE_LOCK, false);
@@ -988,7 +1012,7 @@ public static int getRecentsOpacity(Context context) {
 
     public static int getAllAppsOpacity(Context context) {
         SharedPreferences prefs = LauncherPrefs.getPrefs(context.getApplicationContext());
-        return prefs.getInt(KEY_APP_DRAWER_OPACITY, 80);
+        return prefs.getInt(KEY_APP_DRAWER_OPACITY, 91);
     }
 
     public static boolean isShowMeminfo(Context context) {
@@ -1019,4 +1043,39 @@ public static boolean isSinglePageCentered(Context context) {
     public static boolean isDebugDevice() {
         return !Build.IS_USER;
     }
+
+    public static boolean showQuickspace(Context context) {
+        SharedPreferences prefs = LauncherPrefs.getPrefs(context.getApplicationContext());
+        return prefs.getBoolean(DESKTOP_SHOW_QUICKSPACE, true);
+    }
+
+    public static boolean useAlternativeQuickspaceUI(Context context) {
+        SharedPreferences prefs = LauncherPrefs.getPrefs(context.getApplicationContext());
+        return prefs.getBoolean(KEY_SHOW_ALT_QUICKSPACE, false);
+    }
+
+    public static boolean isQuickspacePersonalityEnabled(Context context) {
+        SharedPreferences prefs = LauncherPrefs.getPrefs(context.getApplicationContext());
+        return prefs.getBoolean(KEY_SHOW_QUICKSPACE_PSONALITY, true);
+    }
+
+    public static boolean isQuickspaceNowPlaying(Context context) {
+        SharedPreferences prefs = LauncherPrefs.getPrefs(context.getApplicationContext());
+        return prefs.getBoolean(KEY_SHOW_QUICKSPACE_NOWPLAYING, true);
+    }
+
+    public static boolean isQuickspaceWeather(Context context) {
+        SharedPreferences prefs = LauncherPrefs.getPrefs(context.getApplicationContext());
+        return prefs.getBoolean(KEY_SHOW_QUICKSPACE_WEATHER, true);
+    }
+
+    public static boolean QuickSpaceShowCity(Context context) {
+        SharedPreferences prefs = LauncherPrefs.getPrefs(context.getApplicationContext());
+        return prefs.getBoolean(KEY_SHOW_QUICKSPACE_WEATHER_CITY, false);
+    }
+
+    public static boolean QuickSpaceShowWeatherText(Context context) {
+        SharedPreferences prefs = LauncherPrefs.getPrefs(context.getApplicationContext());
+        return prefs.getBoolean(KEY_SHOW_QUICKSPACE_WEATHER_TEXT, true);
+    }
 }
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3fbc584f084..2a08fd2b315 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -600,9 +600,10 @@ public void onViewAdded(View child) {
      * Initializes and binds the first page
      */
     public void bindAndInitFirstWorkspaceScreen() {
-        if ((!FeatureFlags.QSB_ON_FIRST_SCREEN
+        if ((!Utilities.showQuickspace(getContext())
                 || !mLauncher.getIsFirstPagePinnedItemEnabled())
                 || shouldShowFirstPageWidget()) {
+            insertNewWorkspaceScreen(Workspace.FIRST_SCREEN_ID, getChildCount());
             mFirstPagePinnedItem = null;
             return;
         }
@@ -614,14 +615,14 @@ public void bindAndInitFirstWorkspaceScreen() {
             // As workspace does not touch the edges, we do not need a full
             // width first page pinned item.
             mFirstPagePinnedItem = LayoutInflater.from(getContext())
-                    .inflate(R.layout.search_container_workspace, firstPage, false);
+                    .inflate(R.layout.reserved_container_workspace, firstPage, false);
         }
 
         int cellHSpan = mLauncher.getDeviceProfile().inv.numSearchContainerColumns;
         CellLayoutLayoutParams lp = new CellLayoutLayoutParams(0, 0, cellHSpan, 1);
         lp.canReorder = false;
         if (!firstPage.addViewToCellLayout(
-                mFirstPagePinnedItem, 0, R.id.search_container_workspace, lp, true)) {
+                mFirstPagePinnedItem, 0, R.id.reserved_container_workspace, lp, true)) {
             Log.e(TAG, "Failed to add to item at (0, 0) to CellLayout");
             mFirstPagePinnedItem = null;
         }
@@ -812,7 +813,7 @@ private void convertFinalScreenToEmptyScreenIfNecessary() {
 
             // We don't want to remove the first screen even if it's empty because that's where
             // first page pinned item would go if it gets turned back on.
-            if (ENABLE_SMARTSPACE_REMOVAL.get() && screenId == FIRST_SCREEN_ID) {
+            if (FeatureFlags.USE_QUICKSPACE_VIEW && screenId == FIRST_SCREEN_ID) {
                 continue;
             }
 
@@ -1029,7 +1030,7 @@ public void stripEmptyScreens() {
             int id = mWorkspaceScreens.keyAt(i);
             CellLayout cl = mWorkspaceScreens.valueAt(i);
             // FIRST_SCREEN_ID can never be removed.
-            if (((!FeatureFlags.QSB_ON_FIRST_SCREEN
+            if (((!FeatureFlags.USE_QUICKSPACE_VIEW
                     || shouldShowFirstPageWidget())
                     || id > FIRST_SCREEN_ID)
                     && cl.getShortcutsAndWidgets().getChildCount() == 0) {
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index f807bdf7b19..a9a21be0f8f 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -62,7 +62,7 @@ private FeatureFlags() { }
      * @deprecated Use {@link BuildConfig#QSB_ON_FIRST_SCREEN} directly
      */
     @Deprecated
-    public static final boolean QSB_ON_FIRST_SCREEN = BuildConfig.QSB_ON_FIRST_SCREEN;
+    public static final boolean USE_QUICKSPACE_VIEW = true;
 
     /**
      * Feature flag to handle define config changes dynamically instead of killing the process.
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 33304489196..126c04c91ce 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -527,14 +527,14 @@ private void populate(BgDataModel dataModel,
         }
 
         // Add first page QSB
-        if (FeatureFlags.QSB_ON_FIRST_SCREEN && dataModel.isFirstPagePinnedItemEnabled
+        if (FeatureFlags.USE_QUICKSPACE_VIEW && dataModel.isFirstPagePinnedItemEnabled
                 && !shouldShowFirstPageWidget()) {
             CellLayout firstScreen = mWorkspaceScreens.get(FIRST_SCREEN_ID);
             View qsb = mHomeElementInflater.inflate(R.layout.qsb_preview, firstScreen, false);
             CellLayoutLayoutParams lp = new CellLayoutLayoutParams(
                     0, 0, firstScreen.getCountX(), 1);
             lp.canReorder = false;
-            firstScreen.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true);
+            firstScreen.addViewToCellLayout(qsb, 0, R.id.reserved_container_workspace, lp, true);
         }
 
         measureView(mRootView, mDp.widthPx, mDp.heightPx);
diff --git a/src/com/android/launcher3/logging/StatsLogManager.java b/src/com/android/launcher3/logging/StatsLogManager.java
index d8388c27090..5fa2d57868f 100644
--- a/src/com/android/launcher3/logging/StatsLogManager.java
+++ b/src/com/android/launcher3/logging/StatsLogManager.java
@@ -281,6 +281,12 @@ public enum LauncherEvent implements EventEnum {
         @UiEvent(doc = "User long presses on the bottom bezel area.")
         LAUNCHER_LONG_PRESS_NAVBAR(1544),
 
+        @UiEvent(doc = "User deep presses on the stashed taskbar")
+        LAUNCHER_DEEP_PRESS_STASHED_TASKBAR(1602),
+
+        @UiEvent(doc = "User long presses on the stashed taskbar")
+        LAUNCHER_LONG_PRESS_STASHED_TASKBAR(1592),
+
         @UiEvent(doc = "User swipes or fling in UP direction from bottom bazel area.")
         LAUNCHER_HOME_GESTURE(574),
 
diff --git a/src/com/android/launcher3/model/BgDataModel.java b/src/com/android/launcher3/model/BgDataModel.java
index 7f0f683091e..a30d30da763 100644
--- a/src/com/android/launcher3/model/BgDataModel.java
+++ b/src/com/android/launcher3/model/BgDataModel.java
@@ -17,7 +17,6 @@
 
 import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_GET_KEY_FIELDS_ONLY;
 
-import static com.android.launcher3.BuildConfig.QSB_ON_FIRST_SCREEN;
 import static com.android.launcher3.config.FeatureFlags.ENABLE_SMARTSPACE_REMOVAL;
 import static com.android.launcher3.config.FeatureFlags.shouldShowFirstPageWidget;
 import static com.android.launcher3.model.WidgetsModel.GO_DISABLE_WIDGETS;
@@ -132,7 +131,7 @@ public class BgDataModel {
      * Load id for which the callbacks were successfully bound
      */
     public int lastLoadId = -1;
-    public boolean isFirstPagePinnedItemEnabled = QSB_ON_FIRST_SCREEN
+    public boolean isFirstPagePinnedItemEnabled = FeatureFlags.USE_QUICKSPACE_VIEW
             && !ENABLE_SMARTSPACE_REMOVAL.get();
 
     /**
@@ -157,7 +156,7 @@ public synchronized IntArray collectWorkspaceScreens() {
                 screenSet.add(item.screenId);
             }
         }
-        if ((FeatureFlags.QSB_ON_FIRST_SCREEN
+        if ((FeatureFlags.USE_QUICKSPACE_VIEW
                 && !shouldShowFirstPageWidget())
                 || screenSet.isEmpty()) {
             screenSet.add(Workspace.FIRST_SCREEN_ID);
diff --git a/src/com/android/launcher3/model/DatabaseHelper.java b/src/com/android/launcher3/model/DatabaseHelper.java
index 13605101e75..de9eb5039b0 100644
--- a/src/com/android/launcher3/model/DatabaseHelper.java
+++ b/src/com/android/launcher3/model/DatabaseHelper.java
@@ -258,7 +258,7 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                         Favorites.SCREEN, IntArray.wrap(-777, -778)), null);
             }
             case 30: {
-                if (FeatureFlags.QSB_ON_FIRST_SCREEN
+                if (Utilities.showQuickspace(mContext)
                         && !shouldShowFirstPageWidget()) {
                     // Clean up first row in screen 0 as it might contain junk data.
                     Log.d(TAG, "Cleaning up first row");
diff --git a/src/com/android/launcher3/model/GridSizeMigrationUtil.java b/src/com/android/launcher3/model/GridSizeMigrationUtil.java
index efd55745196..086c7664be2 100644
--- a/src/com/android/launcher3/model/GridSizeMigrationUtil.java
+++ b/src/com/android/launcher3/model/GridSizeMigrationUtil.java
@@ -332,7 +332,7 @@ private static void solveGridPlacement(@NonNull final DatabaseHelper helper,
         final GridOccupancy occupied = new GridOccupancy(trgX, trgY);
         final Point trg = new Point(trgX, trgY);
         final Point next = new Point(0, screenId == 0
-                && (FeatureFlags.QSB_ON_FIRST_SCREEN
+                && (Utilities.showQuickspace(destReader.mContext)
                 && (!ENABLE_SMARTSPACE_REMOVAL.get() || LauncherPrefs.getPrefs(destReader.mContext)
                 .getBoolean(SMARTSPACE_ON_HOME_SCREEN, true))
                 && !shouldShowFirstPageWidget())
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java
index 43700435694..5ffdb137385 100644
--- a/src/com/android/launcher3/model/LoaderCursor.java
+++ b/src/com/android/launcher3/model/LoaderCursor.java
@@ -529,7 +529,7 @@ protected boolean checkItemPlacement(ItemInfo item, boolean isFirstPagePinnedIte
 
         if (!mOccupied.containsKey(item.screenId)) {
             GridOccupancy screen = new GridOccupancy(countX + 1, countY + 1);
-            if (item.screenId == Workspace.FIRST_SCREEN_ID && (FeatureFlags.QSB_ON_FIRST_SCREEN
+            if (item.screenId == Workspace.FIRST_SCREEN_ID && (Utilities.showQuickspace(mContext)
                     && !shouldShowFirstPageWidget() && isFirstPagePinnedItemEnabled)) {
                 // Mark the first X columns (X is width of the search container) in the first row as
                 // occupied (if the feature is enabled) in order to account for the search
diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java
index 10ae171f9a3..5492bc40da0 100644
--- a/src/com/android/launcher3/model/LoaderTask.java
+++ b/src/com/android/launcher3/model/LoaderTask.java
@@ -383,9 +383,7 @@ protected void loadWorkspace(
             mModelDelegate.markActive();
             logASplit("workspaceDelegateItems");
         }
-        mBgDataModel.isFirstPagePinnedItemEnabled = FeatureFlags.QSB_ON_FIRST_SCREEN
-                && (!ENABLE_SMARTSPACE_REMOVAL.get() || LauncherPrefs.getPrefs(
-                mApp.getContext()).getBoolean(SMARTSPACE_ON_HOME_SCREEN, true));
+        mBgDataModel.isFirstPagePinnedItemEnabled = FeatureFlags.USE_QUICKSPACE_VIEW;
     }
 
     private void loadWorkspaceImpl(
@@ -770,15 +768,8 @@ private void processWorkspaceItem(LoaderCursor c,
                     String savedProvider = c.getAppWidgetProvider();
                     final ComponentName component;
 
-                    if ((c.getOptions() & LauncherAppWidgetInfo.OPTION_SEARCH_WIDGET) != 0) {
-                        component  = QsbContainerView.getSearchComponentName(mApp.getContext());
-                        if (component == null) {
-                            c.markDeleted("Discarding SearchWidget without packagename ");
-                            return;
-                        }
-                    } else {
-                        component = ComponentName.unflattenFromString(savedProvider);
-                    }
+                    component = ComponentName.unflattenFromString(savedProvider);
+
                     final boolean isIdValid =
                             !c.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_ID_NOT_VALID);
                     final boolean wasProviderReady =
diff --git a/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java b/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java
index 929f698236e..01536c6219c 100644
--- a/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java
+++ b/src/com/android/launcher3/model/WorkspaceItemSpaceFinder.java
@@ -23,6 +23,7 @@
 import com.android.launcher3.InvariantDeviceProfile;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
+import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.model.data.ItemInfo;
 import com.android.launcher3.util.GridOccupancy;
@@ -67,7 +68,7 @@ public int[] findSpaceForItem(LauncherAppState app, BgDataModel dataModel,
         int screenCount = workspaceScreens.size();
         // First check the preferred screen.
         IntSet screensToExclude = new IntSet();
-        if (FeatureFlags.QSB_ON_FIRST_SCREEN
+        if (Utilities.showQuickspace(app.getContext())
                 && !shouldShowFirstPageWidget()) {
             screensToExclude.add(FIRST_SCREEN_ID);
         }
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 6528e757bf6..34ec2ae506e 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -1,10 +1,14 @@
 package com.android.launcher3.popup;
 
+import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
+
 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 static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;
 import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_TASK;
 
+import android.app.Activity;
+import android.app.ActivityManagerNative;
 import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.content.Context;
@@ -16,10 +20,12 @@
 import android.net.Uri;
 import android.util.Log;
 import android.view.View;
+import android.view.WindowInsets;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.window.SplashScreen;
 import android.os.UserHandle;
 
 import androidx.annotation.Nullable;
@@ -37,6 +43,7 @@
 import com.android.launcher3.util.PackageUserKey;
 import com.android.launcher3.views.ActivityContext;
 import com.android.launcher3.widget.WidgetsBottomSheet;
+import com.android.systemui.shared.system.ActivityManagerWrapper;
 
 import java.net.URISyntaxException;
 import java.util.List;
@@ -313,6 +320,45 @@ public void onClick(View view) {
         }
     }
 
+    public static final Factory<BaseDraggingActivity> FREE_FORM = (activity, itemInfo, originalView) -> 
+        ActivityManagerWrapper.getInstance().supportsFreeformMultiWindow(activity) 
+        ? new FreeForm(activity, itemInfo, originalView)
+        : null;
+
+    public static class FreeForm extends SystemShortcut<BaseDraggingActivity> {
+        private final String mPackageName;
+        
+        public FreeForm(BaseDraggingActivity target, ItemInfo itemInfo, View originalView) {
+            super(R.drawable.ic_caption_desktop_button_foreground, R.string.recent_task_option_freeform, target, itemInfo, originalView);
+            mPackageName = itemInfo.getTargetComponent().getPackageName();
+        }
+
+        @Override
+        public void onClick(View view) {
+            if (mPackageName != null) {
+                Intent intent = mTarget.getPackageManager().getLaunchIntentForPackage(mPackageName);
+                if (intent != null) {
+                    ActivityOptions options = makeLaunchOptions(mTarget);
+                    mTarget.startActivity(intent, options.toBundle());
+                    AbstractFloatingView.closeAllOpenViews(mTarget);
+                }
+            }
+        }
+
+        private ActivityOptions makeLaunchOptions(Activity activity) {
+            ActivityOptions activityOptions = ActivityOptions.makeBasic();
+            activityOptions.setLaunchWindowingMode(WINDOWING_MODE_FREEFORM);
+            final View decorView = activity.getWindow().getDecorView();
+            final WindowInsets insets = decorView.getRootWindowInsets();
+            final Rect r = new Rect(0, 0, decorView.getWidth() / 2, decorView.getHeight() / 2);
+            r.offsetTo(insets.getSystemWindowInsetLeft() + 50, insets.getSystemWindowInsetTop() + 50);
+            activityOptions.setLaunchBounds(r);
+            activityOptions.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);
+            activityOptions.setTaskOverlay(true /* taskOverlay */, true /* canResume */);
+            return activityOptions;
+        }
+    }
+
     public static <T extends Context & ActivityContext> void dismissTaskMenuView(T activity) {
         AbstractFloatingView.closeOpenViews(activity, true,
             AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);
diff --git a/src/com/android/launcher3/quickspace/QuickEventsController.java b/src/com/android/launcher3/quickspace/QuickEventsController.java
new file mode 100644
index 00000000000..0d9cee9a093
--- /dev/null
+++ b/src/com/android/launcher3/quickspace/QuickEventsController.java
@@ -0,0 +1,428 @@
+/*
+ * Copyright (C) 2018 CypherOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.quickspace;
+
+import android.app.PendingIntent;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.BroadcastReceiver;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.SharedPreferences;
+import android.media.MediaMetadata;
+import android.media.session.MediaController;
+import android.media.session.MediaSession;
+import android.media.session.MediaSessionManager;
+import android.net.Uri;
+import android.provider.AlarmClock;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.widget.Toast;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherFiles;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+
+import java.util.Calendar;
+import java.util.Random;
+
+import java.util.List;
+
+public class QuickEventsController {
+
+    private static final String SETTING_DEVICE_INTRO_COMPLETED = "device_introduction_completed";
+    private Context mContext;
+
+    private String mEventTitle;
+    private String mEventTitleSub;
+    private String mGreetings;
+    private String mClockExt;
+    private OnClickListener mEventTitleSubAction = null;
+    private int mEventSubIcon = 0;
+
+    private boolean mIsQuickEvent = false;
+    private boolean mRunning = true;
+    private boolean mRegistered = false;
+
+    // Device Intro
+    private boolean mIsFirstTimeDone = false;
+    private SharedPreferences mPreferences;
+
+    // PSA + Personality
+    private String[] mPSAMorningStr;
+    private String[] mPSAEvenStr;
+    private String[] mPSAAfterNoonStr;
+    private String[] mPSAMidniteStr;
+    private String[] mPSARandomStr;
+    private String[] mPSAEarlyEvenStr;
+    private String[] mWelcomeStr;
+    private BroadcastReceiver mPSAListener = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            psonalityEvent();
+        }
+    };
+
+    // NowPlaying
+    private boolean mEventNowPlaying = false;
+    private String mNowPlayingTitle;
+    private String mNowPlayingArtist;
+    private boolean mClientLost = true;
+    private boolean mPlayingActive = false;
+
+    public QuickEventsController(Context context) {
+        mContext = context;
+        initQuickEvents();
+    }
+
+    public void initQuickEvents() {
+        mPreferences = mContext.getSharedPreferences(LauncherFiles.SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE);
+        mIsFirstTimeDone = mPreferences.getBoolean(SETTING_DEVICE_INTRO_COMPLETED, false);
+        registerPSAListener();
+        updateQuickEvents();
+    }
+
+    private void registerPSAListener() {
+        if (mRegistered) return;
+        mRegistered = true;
+        IntentFilter psonalityIntent = new IntentFilter();
+        psonalityIntent.addAction(Intent.ACTION_TIME_TICK);
+        psonalityIntent.addAction(Intent.ACTION_TIME_CHANGED);
+        psonalityIntent.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+        mContext.registerReceiver(mPSAListener, psonalityIntent, Context.RECEIVER_NOT_EXPORTED);
+    }
+
+    private void unregisterPSAListener() {
+        if (!mRegistered) return;
+        mRegistered = false;
+        mContext.unregisterReceiver(mPSAListener);
+    }
+
+    public void updateQuickEvents() {
+        deviceIntroEvent();
+        nowPlayingEvent();
+        initNowPlayingEvent();
+        psonalityEvent();
+    }
+
+    private void deviceIntroEvent() {
+        if (!mRunning) return;
+
+        if (mIsFirstTimeDone) return;
+        
+        mIsQuickEvent = true;
+
+        if (Utilities.useAlternativeQuickspaceUI(mContext)) {
+            mEventTitle = mContext.getResources().getString(R.string.quick_event_rom_intro_welcome_ext);
+        } else {
+            mEventTitle = mContext.getResources().getString(R.string.quick_event_rom_intro_welcome);
+        }
+        mWelcomeStr = mContext.getResources().getStringArray(R.array.welcome_message_variants);
+        mEventTitleSub = mWelcomeStr[getLuckyNumber(0,mWelcomeStr.length - 1)];
+        mEventSubIcon = R.drawable.ic_quickspace_derp;
+        mGreetings = mContext.getResources().getString(R.string.quickspace_grt_general);
+        mClockExt = mContext.getResources().getString(R.string.quickspace_ext_two);
+
+        mEventTitleSubAction = new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mContext.getSharedPreferences(LauncherFiles.SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE)
+                        .edit()
+                        .putBoolean(SETTING_DEVICE_INTRO_COMPLETED, true)
+                        .commit();
+                Intent intent = new Intent(Intent.ACTION_MAIN);
+                intent.addCategory(Intent.CATEGORY_HOME);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+                try {
+                    Launcher.getLauncher(mContext).startActivitySafely(view, intent, null);
+                } catch (ActivityNotFoundException ex) {
+                }
+                mIsQuickEvent = false;
+            }
+        };
+    }
+
+    public void nowPlayingEvent() {
+        if (mEventNowPlaying) {
+            boolean infoExpired = !mPlayingActive || mClientLost;
+            if (infoExpired) {
+                mIsQuickEvent = false;
+                mEventNowPlaying = false;
+            }
+        }
+    }
+
+    public void initNowPlayingEvent() {
+        if (!mRunning) return;
+
+        if (!mIsFirstTimeDone) return;
+
+        if (!Utilities.isQuickspaceNowPlaying(mContext)) return;
+
+        if (!mPlayingActive) return;
+
+        if (mNowPlayingTitle == null) return;
+        
+        mEventTitle = mNowPlayingTitle;
+        mGreetings = mContext.getResources().getString(R.string.qe_now_playing_ext_one);
+        mClockExt = "";
+        if (mNowPlayingArtist == null ) {
+            mEventTitleSub = mContext.getResources().getString(R.string.qe_now_playing_unknown_artist);
+        } else {
+            mEventTitleSub = mNowPlayingArtist;
+        }
+        mEventSubIcon = R.drawable.ic_music_note_24dp;
+        mIsQuickEvent = true;
+        mEventNowPlaying = true;
+
+        mEventTitleSubAction = new View.OnClickListener() {
+	        @Override
+	        public void onClick(View view) {
+		    if (mPlayingActive) {
+		        MediaSessionManager mediaSessionManager = (MediaSessionManager) mContext.getSystemService(Context.MEDIA_SESSION_SERVICE);
+		        List<MediaController> sessions = mediaSessionManager.getActiveSessions(null);
+
+		        if (sessions != null && !sessions.isEmpty()) {
+		            MediaController mediaController = sessions.get(0);
+		            MediaSession.Token token = mediaController.getSessionToken();
+		            PendingIntent sessionActivity = mediaController.getSessionActivity();
+
+		            if (sessionActivity != null) {
+		                Intent intent = sessionActivity.getIntent();
+
+		                if (intent != null) {
+		                    ComponentName componentName = intent.getComponent();
+		                    if (componentName != null) {
+		                        String packageName = componentName.getPackageName();
+		                        if (packageName != null) {
+		                            Intent launchIntent = mContext.getPackageManager().getLaunchIntentForPackage(packageName);
+
+		                            if (launchIntent != null) {
+		                                launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		                                try {
+		                                    // try if package name launch intent works
+		                                    mContext.startActivity(launchIntent);
+		                                    return; // Exit the method after starting the activity
+		                                } catch (Exception e) {}
+		                            }
+		                        }
+		                    }
+
+		                    try {
+		                        // try session activity
+		                        mContext.startActivity(intent);
+		                        return; // Exit the method after starting the activity
+		                    } catch (Exception e) {}
+		                }
+		            }
+
+		            // last resort: Work required for local media actions
+		            Intent npIntent = new Intent(Intent.ACTION_MAIN);
+		            npIntent.addCategory(Intent.CATEGORY_APP_MUSIC);
+		            npIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+		            try {
+		                Launcher.getLauncher(mContext).startActivitySafely(view, npIntent, null);
+		            } catch (ActivityNotFoundException ex) {}
+		        }
+		    }
+	        }
+	    };
+    }
+
+    public void psonalityEvent() {
+        if (!mIsFirstTimeDone || mEventNowPlaying) return;
+        mEventSubIcon = 0;
+
+        mEventTitle = Utilities.formatDateTime(mContext);
+        mPSAMorningStr = mContext.getResources().getStringArray(R.array.quickspace_psa_morning);
+        mPSAEvenStr = mContext.getResources().getStringArray(R.array.quickspace_psa_evening);
+        mPSAEarlyEvenStr = mContext.getResources().getStringArray(R.array.quickspace_psa_early_evening);
+        mPSAMidniteStr = mContext.getResources().getStringArray(R.array.quickspace_psa_midnight);
+        mPSAAfterNoonStr = mContext.getResources().getStringArray(R.array.quickspace_psa_noon);
+        mPSARandomStr = mContext.getResources().getStringArray(R.array.quickspace_psa_random);
+        int psaLength;
+
+        mEventTitleSubAction = new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent calendarIntent = new Intent(Intent.ACTION_MAIN);
+                calendarIntent.addCategory(Intent.CATEGORY_APP_CALENDAR);
+
+                Intent clockIntent = new Intent(AlarmClock.ACTION_SHOW_ALARMS);
+
+                PackageManager packageManager = mContext.getPackageManager();
+                List<ResolveInfo> calendarApps = packageManager.queryIntentActivities(calendarIntent, PackageManager.MATCH_DEFAULT_ONLY);
+                List<ResolveInfo> clockApps = packageManager.queryIntentActivities(clockIntent, PackageManager.MATCH_DEFAULT_ONLY);
+
+                if (!calendarApps.isEmpty()) {
+                    calendarIntent.setPackage(calendarApps.get(0).activityInfo.packageName);
+                    try {
+                        mContext.startActivity(calendarIntent);
+                    } catch (ActivityNotFoundException e) {
+                    }
+                } else if (!clockApps.isEmpty()) {
+                    clockIntent.setPackage(clockApps.get(0).activityInfo.packageName);
+                    try {
+                        mContext.startActivity(clockIntent);
+                    } catch (ActivityNotFoundException e) {
+                    }
+                } else {
+                    Toast.makeText(mContext, R.string.intent_no_app_clock_found, Toast.LENGTH_SHORT).show();
+                }
+            }
+        };
+
+        int hourOfDay = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+
+        if (hourOfDay >= 5 && hourOfDay <= 9) {
+            mGreetings = mContext.getResources().getString(R.string.quickspace_grt_morning);
+            mClockExt = mContext.getResources().getString(R.string.quickspace_ext_one);
+        } else if (hourOfDay >= 12 && hourOfDay <= 15) {
+            mGreetings = mContext.getResources().getString(R.string.quickspace_grt_afternoon);
+            mClockExt = mContext.getResources().getString(R.string.quickspace_ext_two);
+        } else if (hourOfDay >= 16 && hourOfDay <= 20) {
+            mGreetings = mContext.getResources().getString(R.string.quickspace_grt_evening);
+            mClockExt = mContext.getResources().getString(R.string.quickspace_ext_two);
+        } else if (hourOfDay >= 21 && hourOfDay <= 23) {
+            mGreetings = mContext.getResources().getString(R.string.quickspace_grt_night);
+            mClockExt = mContext.getResources().getString(R.string.quickspace_ext_two);
+        } else if (hourOfDay >= 0 && hourOfDay <= 3) {
+            mGreetings = mContext.getResources().getString(R.string.quickspace_grt_night);
+            mClockExt = mContext.getResources().getString(R.string.quickspace_ext_two);
+        } else {
+            mGreetings = mContext.getResources().getString(R.string.quickspace_grt_general);
+            mClockExt = mContext.getResources().getString(R.string.quickspace_ext_two);
+        }
+
+        if (Utilities.isQuickspacePersonalityEnabled(mContext)) {
+            if (getLuckyNumber(13) == 7) {
+                psaLength = mPSARandomStr.length - 1;
+                mEventTitleSub = mPSARandomStr[getLuckyNumber(0, psaLength)];
+                mEventSubIcon = R.drawable.ic_quickspace_derp;
+                mIsQuickEvent = true;
+            } else {
+                switch (hourOfDay) {
+                    case 5: case 6: case 7: case 8: case 9:
+                        psaLength = mPSAMorningStr.length - 1;
+                        mEventTitleSub = mPSAMorningStr[getLuckyNumber(0, psaLength)];
+                        mIsQuickEvent = true;
+                        break;
+
+                    case 19: case 20: case 21:
+                        psaLength = mPSAEvenStr.length - 1;
+                        mEventTitleSub = mPSAEvenStr[getLuckyNumber(0, psaLength)];
+                        mIsQuickEvent = true;
+                        break;
+
+                    case 16: case 17: case 18:
+                        psaLength = mPSAEarlyEvenStr.length - 1;
+                        mEventTitleSub = mPSAEarlyEvenStr[getLuckyNumber(0, psaLength)];
+                        mIsQuickEvent = true;
+                        break;
+
+                    case 12: case 13: case 14: case 15:
+                        psaLength = mPSAAfterNoonStr.length - 1;
+                        mEventTitleSub = mPSAAfterNoonStr[getLuckyNumber(0, psaLength)];
+                        mIsQuickEvent = true;
+                        break;
+
+                    case 0: case 1: case 2: case 3:
+                        psaLength = mPSAMidniteStr.length - 1;
+                        mEventTitleSub = mPSAMidniteStr[getLuckyNumber(0, psaLength)];
+                        mIsQuickEvent = true;
+                        break;
+
+                    default:
+                        mEventTitleSub = null;
+                        mIsQuickEvent = false;
+                        break;
+                }
+            }
+        } else {
+            mEventTitleSub = null;
+            mIsQuickEvent = false;
+        }
+    }
+
+    public boolean isQuickEvent() {
+        return mIsQuickEvent;
+    }
+
+    public boolean isDeviceIntroCompleted() {
+        return mIsFirstTimeDone;
+    }
+
+    public String getTitle() {
+        return mEventTitle;
+    }
+
+    public String getActionTitle() {
+        return mEventTitleSub;
+    }
+
+    public String getClockExt() {
+        return mClockExt;
+    }
+
+    public String getGreetings() {
+        return mGreetings;
+    }
+
+    public OnClickListener getAction() {
+        return mEventTitleSubAction;
+    }
+
+    public int getActionIcon() {
+        return mEventSubIcon;
+    }
+
+    public int getLuckyNumber(int max) {
+        return getLuckyNumber(0, max);
+    }
+
+    public int getLuckyNumber(int min, int max) {
+        Random r = new Random();
+        return r.nextInt((max - min) + 1) + min;
+    }
+
+    public void setMediaInfo(String title, String artist, boolean clientLost, boolean activePlayback) {
+        mNowPlayingTitle = title;
+        mNowPlayingArtist = artist;
+        mClientLost = clientLost;
+        mPlayingActive = activePlayback;
+    }
+
+    public boolean isNowPlaying() {
+        return mPlayingActive && Utilities.isQuickspaceNowPlaying(mContext);
+    }
+
+    public void onPause() {
+        mRunning = false;
+        unregisterPSAListener();
+    }
+
+    public void onResume() {
+        mRunning = true;
+        registerPSAListener();
+    }
+}
diff --git a/src/com/android/launcher3/quickspace/QuickSpaceView.java b/src/com/android/launcher3/quickspace/QuickSpaceView.java
new file mode 100644
index 00000000000..7902cd96db5
--- /dev/null
+++ b/src/com/android/launcher3/quickspace/QuickSpaceView.java
@@ -0,0 +1,291 @@
+/*
+ * Copyright (C) 2018-2023 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.quickspace;
+
+import android.animation.LayoutTransition;
+import android.animation.ValueAnimator;
+import android.animation.ValueAnimator.AnimatorUpdateListener;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.ColorStateList;
+import android.text.TextUtils.TruncateAt;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.launcher3.BubbleTextView;
+import com.android.launcher3.model.data.ItemInfo;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.util.Themes;
+
+import com.android.launcher3.quickspace.QuickspaceController.OnDataListener;
+import com.android.launcher3.quickspace.receivers.QuickSpaceActionReceiver;
+import com.android.launcher3.quickspace.views.DateTextView;
+
+public class QuickSpaceView extends FrameLayout implements AnimatorUpdateListener, OnDataListener {
+
+    private static final String TAG = "Launcher3:QuickSpaceView";
+    private static final boolean DEBUG = false;
+
+    public final ColorStateList mColorStateList;
+    public BubbleTextView mBubbleTextView;
+    public final int mQuickspaceBackgroundRes;
+
+    public ViewGroup mQuickspaceContent;
+    public ImageView mEventSubIcon;
+    public TextView mEventTitleSub;
+    public TextView mEventTitleSubColored;
+    public TextView mGreetingsExt;
+    public TextView mGreetingsExtClock;
+    public ViewGroup mWeatherContentSub;
+    public ImageView mWeatherIconSub;
+    public TextView mWeatherTempSub;
+    public TextView mEventTitle;
+
+    public boolean mIsQuickEvent;
+    public boolean mFinishedInflate;
+    public boolean mWeatherAvailable;
+    public boolean mAttached;
+
+    private QuickSpaceActionReceiver mActionReceiver;
+    public QuickspaceController mController;
+
+    public QuickSpaceView(Context context, AttributeSet set) {
+        super(context, set);
+        mActionReceiver = new QuickSpaceActionReceiver(context);
+        mController = new QuickspaceController(context);
+        mColorStateList = ColorStateList.valueOf(Themes.getAttrColor(getContext(), R.attr.workspaceTextColor));
+        mQuickspaceBackgroundRes = R.drawable.bg_quickspace;
+        setClipChildren(false);
+    }
+
+    @Override
+    public void onDataUpdated() {
+        boolean altUI = Utilities.useAlternativeQuickspaceUI(getContext());
+        mController.getEventController().initQuickEvents();
+        mIsQuickEvent = mController.isQuickEvent();
+        if (mEventTitle == null || (altUI && mGreetingsExt == null)) {
+            prepareLayout(altUI);
+        }
+        mWeatherAvailable = mController.isWeatherAvailable() && 
+                mController.getEventController().isDeviceIntroCompleted();
+        loadDoubleLine(altUI);
+    }
+
+    private final void loadDoubleLine(boolean useAlternativeQuickspaceUI) {
+        setBackgroundResource(mQuickspaceBackgroundRes);
+        mEventTitle.setText(mController.getEventController().getTitle());
+        if (useAlternativeQuickspaceUI) {
+            if (!mController.getEventController().getGreetings().isEmpty()) {
+                mGreetingsExt.setVisibility(View.VISIBLE);
+                mGreetingsExt.setText(mController.getEventController().getGreetings());
+                mGreetingsExt.setEllipsize(TruncateAt.END);
+                mGreetingsExt.setOnClickListener(mController.getEventController().getAction());
+            } else {
+                mGreetingsExt.setVisibility(View.GONE);
+            }
+            if (!mController.getEventController().getClockExt().isEmpty()) {
+                mGreetingsExtClock.setVisibility(View.VISIBLE);
+                mGreetingsExtClock.setText(mController.getEventController().getClockExt());
+                mGreetingsExtClock.setOnClickListener(mController.getEventController().getAction());
+            } else {
+                mGreetingsExtClock.setVisibility(View.GONE);
+            }
+        }
+        if (mIsQuickEvent && (Utilities.isQuickspacePersonalityEnabled(getContext()) ||
+                        mController.getEventController().isNowPlaying())) {
+            mEventTitle.setEllipsize(TruncateAt.MARQUEE);
+            mEventTitle.setMarqueeRepeatLimit(3);
+            mEventTitle.setSelected(true);
+            mEventTitle.setOnClickListener(mController.getEventController().getAction());
+            mEventTitleSub.setVisibility(View.VISIBLE);
+            mEventTitleSub.setText(mController.getEventController().getActionTitle());
+            mEventTitleSub.setEllipsize(TruncateAt.MARQUEE);
+            mEventTitleSub.setMarqueeRepeatLimit(3);
+            mEventTitleSub.setSelected(true);
+            mEventTitleSub.setOnClickListener(mController.getEventController().getAction());
+            if (useAlternativeQuickspaceUI) {
+                if (mController.getEventController().isNowPlaying()) {
+                    mEventSubIcon.setVisibility(View.GONE);
+                    mEventTitleSub.setOnClickListener(mController.getEventController().getAction());
+                    mEventTitleSubColored.setVisibility(View.VISIBLE);
+                    mEventTitleSubColored.setText(getContext().getString(R.string.qe_now_playing_by));
+                    mEventTitleSubColored.setOnClickListener(mController.getEventController().getAction());
+                } else {
+                    setEventSubIcon();
+                    mEventTitleSubColored.setText("");
+                    mEventTitleSubColored.setVisibility(View.GONE);
+                }
+            } else {
+                setEventSubIcon();
+            }
+        } else {
+            mEventTitleSub.setVisibility(View.GONE);
+            mEventSubIcon.setVisibility(View.GONE);
+            if (useAlternativeQuickspaceUI) {
+                mEventTitleSubColored.setVisibility(View.GONE);
+            }
+        }
+        bindWeather(mWeatherContentSub, mWeatherTempSub, mWeatherIconSub);
+    }
+
+    private void setEventSubIcon() {
+        int icon = mController.getEventController().getActionIcon();
+        if (icon > 0) {
+            mEventSubIcon.setVisibility(View.VISIBLE);
+            mEventSubIcon.setImageTintList(mColorStateList);
+            mEventSubIcon.setImageResource(mController.getEventController().getActionIcon());
+            mEventSubIcon.setOnClickListener(mController.getEventController().getAction());
+        } else {
+            mEventSubIcon.setVisibility(View.GONE);
+        }
+    }
+
+    private final void bindWeather(View container, TextView title, ImageView icon) {
+        if (!mWeatherAvailable || mController.getEventController().isNowPlaying()) {
+            container.setVisibility(View.GONE);
+            return;
+        }
+        String weatherTemp = mController.getWeatherTemp();
+        if (weatherTemp == null || weatherTemp.isEmpty()) {
+            container.setVisibility(View.GONE);
+            return;
+        }
+        boolean hasGoogleApp = isPackageEnabled("com.google.android.googlequicksearchbox", getContext());
+        container.setVisibility(View.VISIBLE);
+        container.setOnClickListener(hasGoogleApp ? mActionReceiver.getWeatherAction() : null);
+        title.setText(weatherTemp);
+        icon.setImageDrawable(mController.getWeatherIcon());
+    }
+
+    private final void loadViews() {
+        mEventTitle = (TextView) findViewById(R.id.quick_event_title);
+        mEventTitleSub = (TextView) findViewById(R.id.quick_event_title_sub);
+        mEventTitleSubColored = (TextView) findViewById(R.id.quick_event_title_sub_colored);
+        mEventSubIcon = (ImageView) findViewById(R.id.quick_event_icon_sub);
+        mWeatherIconSub = (ImageView) findViewById(R.id.quick_event_weather_icon);
+        mQuickspaceContent = (ViewGroup) findViewById(R.id.quickspace_content);
+        mWeatherContentSub = (ViewGroup) findViewById(R.id.quick_event_weather_content);
+        mWeatherTempSub = (TextView) findViewById(R.id.quick_event_weather_temp);
+        if (Utilities.useAlternativeQuickspaceUI(getContext())) {
+            mGreetingsExtClock = (TextView) findViewById(R.id.extended_greetings_clock);
+            mGreetingsExt = (TextView) findViewById(R.id.extended_greetings);
+        }
+    }
+
+    private void prepareLayout(boolean useAlternativeQuickspaceUI) {
+        int indexOfChild = indexOfChild(mQuickspaceContent);
+        removeView(mQuickspaceContent);
+        if (useAlternativeQuickspaceUI) {
+            addView(LayoutInflater.from(getContext()).inflate(R.layout.quickspace_alternate_double, this, false), indexOfChild);
+        } else {
+            addView(LayoutInflater.from(getContext()).inflate(R.layout.quickspace_doubleline, this, false), indexOfChild);
+        }
+
+        loadViews();
+        getQuickSpaceView();
+    }
+
+    private void getQuickSpaceView() {
+        if (mQuickspaceContent.getVisibility() != View.VISIBLE) {
+        	mQuickspaceContent.setVisibility(View.VISIBLE);
+            mQuickspaceContent.setAlpha(0.0f);
+            mQuickspaceContent.animate().setDuration(200).alpha(1.0f);
+        }
+    }
+
+    @Override
+    public void onAnimationUpdate(ValueAnimator valueAnimator) {
+        invalidate();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (mAttached)
+            return;
+
+        mAttached = true;
+        if (mController != null && mFinishedInflate) {
+            mController.addListener(this);
+        }
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        if (!mAttached)
+            return;
+
+        mAttached = false;
+        if (mController != null) {
+            mController.removeListener(this);
+        }
+    }
+
+    public boolean isPackageEnabled(String pkgName, Context context) {
+        try {
+            return context.getPackageManager().getApplicationInfo(pkgName, 0).enabled;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public void onFinishInflate() {
+        super.onFinishInflate();
+        loadViews();
+        mFinishedInflate = true;
+        mBubbleTextView = findViewById(R.id.dummyBubbleTextView);
+        mBubbleTextView.setTag(new ItemInfo() {
+            @Override
+            public ComponentName getTargetComponent() {
+                return new ComponentName(getContext(), "");
+            }
+        });
+        mBubbleTextView.setContentDescription("");
+        if (isAttachedToWindow()) {
+            if (mController != null) {
+                mController.addListener(this);
+            }
+        }
+    }
+
+    @Override
+    public void onLayout(boolean b, int n, int n2, int n3, int n4) {
+        super.onLayout(b, n, n2, n3, n4);
+    }
+
+    public void onPause() {
+        mController.onPause();
+    }
+
+    public void onResume() {
+        mController.onResume();
+    }
+
+    public void setPadding(int n, int n2, int n3, int n4) {
+        super.setPadding(0, 0, 0, 0);
+    }
+
+}
diff --git a/src/com/android/launcher3/quickspace/QuickspaceController.java b/src/com/android/launcher3/quickspace/QuickspaceController.java
new file mode 100644
index 00000000000..c7dae879b8f
--- /dev/null
+++ b/src/com/android/launcher3/quickspace/QuickspaceController.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2018 CypherOS
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.quickspace;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.media.AudioManager;
+import android.media.MediaMetadataRetriever;
+import android.media.RemoteControlClient;
+import android.media.RemoteController;
+import android.os.Handler;
+import android.service.notification.StatusBarNotification;
+import android.util.Log;
+
+import com.android.internal.util.derp.OmniJawsClient;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+import com.android.launcher3.notification.NotificationKeyData;
+import com.android.launcher3.notification.NotificationListener;
+import com.android.launcher3.util.PackageUserKey;
+
+import java.util.ArrayList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.List;
+
+public class QuickspaceController implements NotificationListener.NotificationsChangedListener, OmniJawsClient.OmniJawsObserver {
+
+    public final ArrayList<OnDataListener> mListeners = new ArrayList();
+    private static final String SETTING_WEATHER_LOCKSCREEN_UNIT = "weather_lockscreen_unit";
+    private static final boolean DEBUG = false;
+    private static final String TAG = "Launcher3:QuickspaceController";
+
+    private final Context mContext;
+    private final Handler mHandler;
+    private QuickEventsController mEventsController;
+    private OmniJawsClient mWeatherClient;
+    private OmniJawsClient.WeatherInfo mWeatherInfo;
+    private Drawable mConditionImage;
+
+    private boolean mUseImperialUnit;
+
+    private AudioManager mAudioManager;
+    private Metadata mMetadata = new Metadata();
+    private RemoteController mRemoteController;
+    private boolean mClientLost = true;
+    private boolean mMediaActive = false;
+    private ExecutorService executorService = Executors.newSingleThreadExecutor();
+
+    public interface OnDataListener {
+        void onDataUpdated();
+    }
+
+    public QuickspaceController(Context context) {
+        mContext = context;
+        mHandler = new Handler();
+        mEventsController = new QuickEventsController(context);
+        mWeatherClient = new OmniJawsClient(context);
+        mRemoteController = new RemoteController(context, mRCClientUpdateListener);
+        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+        mAudioManager.registerRemoteController(mRemoteController);
+    }
+
+    private void addWeatherProvider() {
+        if (!Utilities.isQuickspaceWeather(mContext)) return;
+        mWeatherClient.addObserver(this);
+        queryAndUpdateWeather();
+    }
+
+    public void addListener(OnDataListener listener) {
+        mListeners.add(listener);
+        addWeatherProvider();
+        listener.onDataUpdated();
+    }
+
+    public void removeListener(OnDataListener listener) {
+        if (mWeatherClient != null) {
+            mWeatherClient.removeObserver(this);
+        }
+        mListeners.remove(listener);
+    }
+
+    public boolean isQuickEvent() {
+        return mEventsController.isQuickEvent();
+    }
+
+    public QuickEventsController getEventController() {
+        return mEventsController;
+    }
+
+    public boolean isWeatherAvailable() {
+        return mWeatherClient != null && mWeatherClient.isOmniJawsEnabled();
+    }
+
+    public Drawable getWeatherIcon() {
+        return mConditionImage;
+    }
+
+    public String getWeatherTemp() {
+        boolean shouldShowCity = Utilities.QuickSpaceShowCity(mContext);
+        boolean showWeatherText = Utilities.QuickSpaceShowWeatherText(mContext);
+        if (mWeatherInfo != null) {
+            String formattedCondition = mWeatherInfo.condition;
+            if (formattedCondition.toLowerCase().contains("clouds")) {
+                formattedCondition = mContext.getResources().getString(R.string.quick_event_weather_clouds);
+            } else if (formattedCondition.toLowerCase().contains("rain")) {
+                formattedCondition = mContext.getResources().getString(R.string.quick_event_weather_rain);
+            } else if (formattedCondition.toLowerCase().contains("clear")) {
+                formattedCondition = mContext.getResources().getString(R.string.quick_event_weather_clear);
+            } else if (formattedCondition.toLowerCase().contains("storm")) {
+                formattedCondition = mContext.getResources().getString(R.string.quick_event_weather_storm);
+            } else if (formattedCondition.toLowerCase().contains("snow")) {
+                formattedCondition = mContext.getResources().getString(R.string.quick_event_weather_snow);
+            } else if (formattedCondition.toLowerCase().contains("wind")) {
+                formattedCondition = mContext.getResources().getString(R.string.quick_event_weather_wind);
+            } else if (formattedCondition.toLowerCase().contains("mist")) {
+                formattedCondition = mContext.getResources().getString(R.string.quick_event_weather_mist);
+            }
+            String weatherTemp = (shouldShowCity ? mWeatherInfo.city : "") + " " + mWeatherInfo.temp +
+                    mWeatherInfo.tempUnits  + (showWeatherText ? " · "  + formattedCondition : "");
+            return weatherTemp;
+        }
+        return null;
+    }
+
+    private void playbackStateUpdate(int state) {
+        boolean active;
+        switch (state) {
+            case RemoteControlClient.PLAYSTATE_PLAYING:
+                active = true;
+                break;
+            case RemoteControlClient.PLAYSTATE_ERROR:
+            case RemoteControlClient.PLAYSTATE_PAUSED:
+            default:
+                active = false;
+                break;
+        }
+        if (active != mMediaActive) {
+            mMediaActive = active;
+        }
+        updateMediaInfo();
+    }
+
+    public void updateMediaInfo() {
+        if (mEventsController != null) {
+            mEventsController.setMediaInfo(mMetadata.trackTitle, mMetadata.trackArtist, mClientLost, mMediaActive);
+            mEventsController.updateQuickEvents();
+            notifyListeners();
+        }
+    }
+
+    @Override
+    public void onNotificationPosted(PackageUserKey postedPackageUserKey,
+                                     NotificationKeyData notificationKey) {
+        updateMediaInfo();
+    }
+
+    @Override
+    public void onNotificationRemoved(PackageUserKey removedPackageUserKey,
+                                      NotificationKeyData notificationKey) {
+        updateMediaInfo();
+    }
+
+    @Override
+    public void onNotificationFullRefresh(List<StatusBarNotification> activeNotifications) {
+        updateMediaInfo();
+    }
+
+    public void onPause() {
+        if (mEventsController != null) mEventsController.onPause();
+    }
+
+    public void onResume() {
+        if (mEventsController != null) {
+            updateMediaInfo();
+            mEventsController.onResume();
+            notifyListeners();
+        }
+    }
+
+    @Override
+    public void weatherUpdated() {
+        queryAndUpdateWeather();
+    }
+
+    @Override
+    public void weatherError(int errorReason) {
+        Log.d(TAG, "weatherError " + errorReason);
+        if (errorReason == OmniJawsClient.EXTRA_ERROR_DISABLED) {
+            mWeatherInfo = null;
+            notifyListeners();
+        }
+    }
+
+    @Override
+    public void updateSettings() {
+        Log.i(TAG, "updateSettings");
+        queryAndUpdateWeather();
+    }
+
+    private void queryAndUpdateWeather() {
+        executorService.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    mWeatherClient.queryWeather();
+                    mWeatherInfo = mWeatherClient.getWeatherInfo();
+                    if (mWeatherInfo != null) {
+                        mConditionImage = mWeatherClient.getWeatherConditionImage(mWeatherInfo.conditionCode);
+                    }
+                    notifyListeners();
+                } catch(Exception e) {
+                    // Do nothing
+                }
+            }
+        });
+    }
+
+    public void notifyListeners() {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                for (OnDataListener list : mListeners) {
+                    list.onDataUpdated();
+                }
+            }
+        });
+    }
+
+   private RemoteController.OnClientUpdateListener mRCClientUpdateListener =
+            new RemoteController.OnClientUpdateListener() {
+
+        @Override
+        public void onClientChange(boolean clearing) {
+            if (clearing) {
+                mMetadata.clear();
+                mMediaActive = false;
+                mClientLost = true;
+            }
+            updateMediaInfo();
+        }
+
+        @Override
+        public void onClientPlaybackStateUpdate(int state, long stateChangeTimeMs,
+                long currentPosMs, float speed) {
+            mClientLost = false;
+            playbackStateUpdate(state);
+        }
+
+        @Override
+        public void onClientPlaybackStateUpdate(int state) {
+            mClientLost = false;
+            playbackStateUpdate(state);
+        }
+
+        @Override
+        public void onClientMetadataUpdate(RemoteController.MetadataEditor data) {
+            mMetadata.trackTitle = data.getString(MediaMetadataRetriever.METADATA_KEY_TITLE,
+                    mMetadata.trackTitle);
+            mMetadata.trackArtist = data.getString(MediaMetadataRetriever.METADATA_KEY_ARTIST,
+                    mMetadata.trackArtist);
+            mClientLost = false;
+            updateMediaInfo();
+        }
+
+        @Override
+        public void onClientTransportControlUpdate(int transportControlFlags) {
+        }
+    };
+
+    class Metadata {
+        private String trackTitle;
+        private String trackArtist;
+
+         public void clear() {
+            trackTitle = null;
+            trackArtist = null;
+        }
+    }
+}
diff --git a/src/com/android/launcher3/quickspace/receivers/QuickSpaceActionReceiver.java b/src/com/android/launcher3/quickspace/receivers/QuickSpaceActionReceiver.java
new file mode 100644
index 00000000000..e67645ae60b
--- /dev/null
+++ b/src/com/android/launcher3/quickspace/receivers/QuickSpaceActionReceiver.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2018-2023 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.quickspace.receivers;
+
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.LauncherApps;
+import android.net.Uri;
+import android.os.Process;
+import android.os.UserHandle;
+import android.provider.CalendarContract;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+
+public class QuickSpaceActionReceiver {
+
+    private static Context mContext;
+    private final LauncherApps mLauncherApps;
+
+    public OnClickListener mCalendarClickListener;
+    public OnClickListener mWeatherClickListener;
+
+    public QuickSpaceActionReceiver(Context context) {
+        mContext = context;
+        mLauncherApps = context.getSystemService(LauncherApps.class);
+
+        mCalendarClickListener = new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                openGoogleCalendar(view);
+            }
+        };
+
+        mWeatherClickListener = new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                openGoogleWeather(view);
+            }
+        };
+    }
+
+    private void openGoogleCalendar(View view) {
+        final Uri content_URI = CalendarContract.CONTENT_URI;
+        final Uri.Builder appendPath = content_URI.buildUpon().appendPath("time");
+        ContentUris.appendId(appendPath, System.currentTimeMillis());
+        final Intent addFlags = new Intent(Intent.ACTION_VIEW)
+                .setData(appendPath.build())
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+        try {
+            Launcher.getLauncher(mContext).startActivitySafely(view, addFlags, null);
+        } catch (ActivityNotFoundException ex) {
+            mLauncherApps.startAppDetailsActivity(new ComponentName("com.google.android.googlequicksearchbox", ""), Process.myUserHandle(), null, null);
+        }
+    }
+
+    private void openGoogleWeather(View view) {
+        Intent intent = new Intent("android.intent.action.VIEW");
+        intent.setData(Uri.parse("dynact://velour/weather/ProxyActivity"));
+        intent.setComponent(new ComponentName("com.google.android.googlequicksearchbox", "com.google.android.apps.gsa.velour.DynamicActivityTrampoline"));
+        try {
+            Launcher.getLauncher(mContext).startActivitySafely(view, intent, null);
+        } catch (ActivityNotFoundException ex) {
+            mLauncherApps.startAppDetailsActivity(new ComponentName("com.google.android.googlequicksearchbox",
+                    "com.google.android.apps.gsa.velour.DynamicActivityTrampoline"), Process.myUserHandle(), null, null);
+        }
+    }
+
+    public OnClickListener getCalendarAction() {
+        return mCalendarClickListener;
+    }
+
+    public OnClickListener getWeatherAction() {
+        return mWeatherClickListener;
+    }
+}
diff --git a/src/com/android/launcher3/quickspace/views/DateTextView.java b/src/com/android/launcher3/quickspace/views/DateTextView.java
new file mode 100644
index 00000000000..015ce71459d
--- /dev/null
+++ b/src/com/android/launcher3/quickspace/views/DateTextView.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2018-2023 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.quickspace.views;
+
+import android.annotation.TargetApi;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.icu.text.DateFormat;
+import android.icu.text.DisplayContext;
+import android.text.format.DateUtils;
+import android.util.AttributeSet;
+
+import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
+
+import java.util.Locale;
+
+public class DateTextView extends DoubleShadowTextView {
+
+    private DateFormat mDateFormat;
+    private final BroadcastReceiver mTimeChangeReceiver;
+    private boolean mIsVisible = false;
+
+    public DateTextView(final Context context) {
+        this(context, null);
+    }
+
+    public DateTextView(final Context context, final AttributeSet set) {
+        super(context, set, 0);
+        mTimeChangeReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                reloadDateFormat(!Intent.ACTION_TIME_TICK.equals(intent.getAction()));
+            }
+        };
+    }
+
+    public void reloadDateFormat(boolean forcedChange) {
+        String format;
+        if (mDateFormat == null || forcedChange) {
+            String styleText;
+            Context context = getContext();
+            if (Utilities.useAlternativeQuickspaceUI(context)) {
+                styleText = context.getString(R.string.quickspace_date_format_minimalistic);
+            } else {
+                styleText = context.getString(R.string.quickspace_date_format);
+            }
+            mDateFormat = DateFormat.getInstanceForSkeleton(styleText, Locale.getDefault());
+            mDateFormat.setContext(DisplayContext.CAPITALIZATION_FOR_STANDALONE);
+        }
+        format = mDateFormat.format(System.currentTimeMillis());
+        setText(format);
+        setContentDescription(format);
+    }
+
+    private void registerReceiver() {
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_TIME_TICK);
+        intentFilter.addAction(Intent.ACTION_TIME_CHANGED);
+        intentFilter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
+        getContext().registerReceiver(mTimeChangeReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED);
+    }
+
+    private void unregisterReceiver() {
+        getContext().unregisterReceiver(mTimeChangeReceiver);
+    }
+
+    public void onVisibilityAggregated(boolean isVisible) {
+        super.onVisibilityAggregated(isVisible);
+        if (!mIsVisible && isVisible) {
+            mIsVisible = true;
+            registerReceiver();
+            reloadDateFormat(true);
+        } else if (mIsVisible && !isVisible) {
+            unregisterReceiver();
+            mIsVisible = false;
+        }
+    }
+}
diff --git a/src/com/android/launcher3/quickspace/views/DoubleShadowTextView.java b/src/com/android/launcher3/quickspace/views/DoubleShadowTextView.java
new file mode 100644
index 00000000000..1bf019f0d6b
--- /dev/null
+++ b/src/com/android/launcher3/quickspace/views/DoubleShadowTextView.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2018-2023 crDroid Android Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.quickspace.views;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import com.android.launcher3.views.DoubleShadowBubbleTextView;
+
+public class DoubleShadowTextView extends TextView {
+
+    private final DoubleShadowBubbleTextView.ShadowInfo mShadowInfo;
+
+    public DoubleShadowTextView(Context context) {
+        this(context, null);
+    }
+
+    public DoubleShadowTextView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public DoubleShadowTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mShadowInfo = new DoubleShadowBubbleTextView.ShadowInfo(context, attrs, defStyleAttr);
+        setShadowLayer(Math.max(mShadowInfo.keyShadowBlur + mShadowInfo.keyShadowOffsetX, mShadowInfo.ambientShadowBlur), 0f, 0f, mShadowInfo.keyShadowColor);
+    }
+
+    protected void onDraw(Canvas canvas) {
+        if (mShadowInfo.skipDoubleShadow(this)) {
+            super.onDraw(canvas);
+            return;
+        }
+        getPaint().setShadowLayer(mShadowInfo.ambientShadowBlur, 0.0f, 0.0f, mShadowInfo.ambientShadowColor);
+        super.onDraw(canvas);
+        getPaint().setShadowLayer(mShadowInfo.keyShadowBlur, 0.0f, mShadowInfo.keyShadowOffsetX, mShadowInfo.keyShadowColor);
+        super.onDraw(canvas);
+    }
+}
diff --git a/src/com/android/launcher3/settings/SettingsHomescreen.java b/src/com/android/launcher3/settings/SettingsHomescreen.java
index dea4e35c105..83c44ee9a82 100644
--- a/src/com/android/launcher3/settings/SettingsHomescreen.java
+++ b/src/com/android/launcher3/settings/SettingsHomescreen.java
@@ -46,6 +46,8 @@
 
 import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 
+import com.android.internal.util.derp.OmniJawsClient;
+
 public class SettingsHomescreen extends CollapsingToolbarBaseActivity
         implements OnPreferenceStartFragmentCallback, OnPreferenceStartScreenCallback,
         SharedPreferences.OnSharedPreferenceChangeListener{
@@ -109,6 +111,13 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
             case Utilities.KEY_HOTSEAT_OPACITY:
             case Utilities.KEY_SHORT_PARALLAX:
             case Utilities.KEY_SINGLE_PAGE_CENTER:
+            case Utilities.DESKTOP_SHOW_QUICKSPACE:
+            case Utilities.KEY_SHOW_ALT_QUICKSPACE:
+            case Utilities.KEY_SHOW_QUICKSPACE_NOWPLAYING:
+            case Utilities.KEY_SHOW_QUICKSPACE_WEATHER:
+            case Utilities.KEY_SHOW_QUICKSPACE_PSONALITY:
+            case Utilities.KEY_SHOW_QUICKSPACE_WEATHER_CITY:
+            case Utilities.KEY_SHOW_QUICKSPACE_WEATHER_TEXT:
                 LauncherAppState.getInstanceNoCreate().setNeedsRestart();
                 break;
             default:
@@ -168,6 +177,9 @@ public static class HomescreenSettingsFragment extends PreferenceFragmentCompat
 
         private Preference mShowGoogleAppPref;
         private Preference mShowGoogleBarPref;
+        private Preference mWeatherPref;
+
+        private OmniJawsClient mWeatherClient;
 
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -193,6 +205,13 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             mShowGoogleBarPref = screen.findPreference(Utilities.KEY_DOCK_SEARCH);
             updateIsGoogleAppEnabled();
 
+            mWeatherClient = new OmniJawsClient(getContext());
+            mWeatherPref = getPreferenceScreen().findPreference(Utilities.KEY_SHOW_QUICKSPACE_WEATHER);
+            if (!mWeatherClient.isOmniJawsEnabled()) {
+                mWeatherPref.setEnabled(false);
+                mWeatherPref.setSummary(R.string.quick_event_ambient_weather_enabled_info);
+            }
+
             if (getActivity() != null && !TextUtils.isEmpty(getPreferenceScreen().getTitle())) {
                 getActivity().setTitle(getPreferenceScreen().getTitle());
             }
diff --git a/src/com/android/launcher3/settings/SettingsRecents.java b/src/com/android/launcher3/settings/SettingsRecents.java
index aca62037006..07fc11fb7d7 100644
--- a/src/com/android/launcher3/settings/SettingsRecents.java
+++ b/src/com/android/launcher3/settings/SettingsRecents.java
@@ -100,7 +100,15 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+            switch (key) {
+            case Utilities.KEY_RECENTS_CHIPS:
+                LauncherAppState.getInstanceNoCreate().setNeedsRestart();
+                break;
+            default:
+                break;
+        }
+    }
 
     private boolean startPreference(String fragment, Bundle args, String key) {
         if (Utilities.ATLEAST_P && getSupportFragmentManager().isStateSaved()) {