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