diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java index 8837c0ec75..574cd3402b 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java @@ -74,6 +74,7 @@ import com.android.launcher3.util.WindowBounds; import com.android.quickstep.inputconsumers.AccessibilityInputConsumer; import com.android.quickstep.inputconsumers.AssistantInputConsumer; import com.android.quickstep.inputconsumers.DeviceLockedInputConsumer; +import com.android.quickstep.inputconsumers.OneHandedModeInputConsumer; import com.android.quickstep.inputconsumers.OtherActivityInputConsumer; import com.android.quickstep.inputconsumers.OverscrollInputConsumer; import com.android.quickstep.inputconsumers.OverviewInputConsumer; @@ -500,6 +501,11 @@ public class TouchInteractionService extends Service implements PluginListener mSquaredSlop) { + mStartDragPos.set(mLastPos.x, mLastPos.y); + if ((!mDeviceState.isOneHandedModeActive() && isValidStartAngle( + mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y)) + || (mDeviceState.isOneHandedModeActive() && isValidExitAngle( + mDownPos.x - mLastPos.x, mDownPos.y - mLastPos.y))) { + mPassedSlop = true; + setActive(ev); + } else { + mState = STATE_DELEGATE_ACTIVE; + } + } + } else { + float distance = (float) Math.hypot(mLastPos.x - mStartDragPos.x, + mLastPos.y - mStartDragPos.y); + if (distance > mDragDistThreshold && mPassedSlop + && mDeviceState.isOneHandedModeActive()) { + SystemUiProxy.INSTANCE.get(mContext).stopOneHandedMode(); + } + } + break; + } + case ACTION_UP: + case ACTION_CANCEL: { + if (mLastPos.y >= mStartDragPos.y && mPassedSlop + && !mDeviceState.isOneHandedModeActive()) { + SystemUiProxy.INSTANCE.get(mContext).startOneHandedMode(); + } + + mPassedSlop = false; + mState = STATE_INACTIVE; + break; + } + } + + if (mState != STATE_ACTIVE) { + mDelegate.onMotionEvent(ev); + } + } + + private boolean isValidStartAngle(float deltaX, float deltaY) { + final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX)); + return angle > -(ANGLE_MAX) && angle < -(ANGLE_MIN); + } + + private boolean isValidExitAngle(float deltaX, float deltaY) { + final float angle = (float) Math.toDegrees(Math.atan2(deltaY, deltaX)); + return angle > ANGLE_MIN && angle < ANGLE_MAX; + } +} diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 9d703167d9..6737c5f61d 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -76,6 +76,10 @@ 55dp 55dp + + + 20dp + 28dp diff --git a/quickstep/src/com/android/quickstep/InputConsumer.java b/quickstep/src/com/android/quickstep/InputConsumer.java index ec720d5d5e..67711c0810 100644 --- a/quickstep/src/com/android/quickstep/InputConsumer.java +++ b/quickstep/src/com/android/quickstep/InputConsumer.java @@ -35,6 +35,7 @@ public interface InputConsumer { int TYPE_RESET_GESTURE = 1 << 8; int TYPE_OVERSCROLL = 1 << 9; int TYPE_SYSUI_OVERLAY = 1 << 10; + int TYPE_ONE_HANDED = 1 << 11; String[] NAMES = new String[] { "TYPE_NO_OP", // 0 @@ -47,7 +48,8 @@ public interface InputConsumer { "TYPE_OVERVIEW_WITHOUT_FOCUS", // 7 "TYPE_RESET_GESTURE", // 8 "TYPE_OVERSCROLL", // 9 - "TYPE_SYSUI_OVERLAY" // 10 + "TYPE_SYSUI_OVERLAY", // 10 + "TYPE_ONE_HANDED", // 11 }; InputConsumer NO_OP = () -> TYPE_NO_OP; diff --git a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java index 1081548b0d..03d44e8c81 100644 --- a/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java +++ b/quickstep/src/com/android/quickstep/OrientationTouchTransformer.java @@ -63,6 +63,7 @@ class OrientationTouchTransformer { private SparseArray mSwipeTouchRegions = new SparseArray<>(MAX_ORIENTATIONS); private final RectF mAssistantLeftRegion = new RectF(); private final RectF mAssistantRightRegion = new RectF(); + private final RectF mOneHandedModeRegion = new RectF(); private int mCurrentDisplayRotation; private boolean mEnableMultipleRegions; private Resources mResources; @@ -216,10 +217,10 @@ class OrientationTouchTransformer { Point size = display.realSize; int rotation = display.rotation; + int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE); OrientationRectF orientationRectF = new OrientationRectF(0, 0, size.x, size.y, rotation); if (mMode == SysUINavigationMode.Mode.NO_BUTTON) { - int touchHeight = getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE); orientationRectF.top = orientationRectF.bottom - touchHeight; updateAssistantRegions(orientationRectF); } else { @@ -235,10 +236,11 @@ class OrientationTouchTransformer { + getNavbarSize(ResourceUtils.NAVBAR_LANDSCAPE_LEFT_RIGHT_SIZE); break; default: - orientationRectF.top = orientationRectF.bottom - - getNavbarSize(ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE); + orientationRectF.top = orientationRectF.bottom - touchHeight; } } + // One handed gestural only active on portrait mode + mOneHandedModeRegion.set(0, orientationRectF.bottom - touchHeight, size.x, size.y); return orientationRectF; } @@ -264,6 +266,10 @@ class OrientationTouchTransformer { } + boolean touchInOneHandedModeRegion(MotionEvent ev) { + return mOneHandedModeRegion.contains(ev.getX(), ev.getY()); + } + private int getNavbarSize(String resName) { return ResourceUtils.getNavbarSize(resName, mResources); } @@ -355,6 +361,7 @@ class OrientationTouchTransformer { regions.append(rectF.mRotation).append(" "); } pw.println(regions.toString()); + pw.println(" mOneHandedModeRegion=" + mOneHandedModeRegion); } private class OrientationRectF extends RectF { diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index 7a6bbb4ab9..87522b852e 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -29,6 +29,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_G import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NAV_BAR_HIDDEN; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; +import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_ONE_HANDED_ACTIVE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING; @@ -43,10 +44,13 @@ import android.content.IntentFilter; import android.content.res.Resources; import android.graphics.Region; import android.os.Process; +import android.os.SystemProperties; import android.os.UserManager; import android.provider.Settings; import android.text.TextUtils; +import android.util.DisplayMetrics; import android.view.MotionEvent; +import android.view.Surface; import androidx.annotation.BinderThread; @@ -73,6 +77,8 @@ public class RecentsAnimationDeviceState implements NavigationModeChangeListener, DefaultDisplay.DisplayInfoChangeListener { + private static boolean sIsOneHandedEnabled; + private final Context mContext; private final SysUINavigationMode mSysUiNavMode; private final DefaultDisplay mDefaultDisplay; @@ -84,6 +90,7 @@ public class RecentsAnimationDeviceState implements private @SystemUiStateFlags int mSystemUiStateFlags; private SysUINavigationMode.Mode mMode = THREE_BUTTONS; private NavBarPosition mNavBarPosition; + private SecureSettingsObserver mOneHandedEnabledObserver; private final Region mDeferredGestureRegion = new Region(); private boolean mAssistantAvailable; @@ -157,6 +164,13 @@ public class RecentsAnimationDeviceState implements } } + if (SystemProperties.getBoolean("ro.support_one_handed_mode", false)) { + mOneHandedEnabledObserver = SecureSettingsObserver.newOneHandedSettingsObserver( + mContext, this::onOneHandedEnabledSettingsChanged); + mOneHandedEnabledObserver.register(); + mOneHandedEnabledObserver.dispatchOnChange(); + } + SecureSettingsObserver userSetupObserver = new SecureSettingsObserver( context.getContentResolver(), e -> mIsUserSetupComplete = e, @@ -405,6 +419,13 @@ public class RecentsAnimationDeviceState implements return (mSystemUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) != 0; } + /** + * @return whether screen pinning is enabled and active + */ + public boolean isOneHandedModeActive() { + return (mSystemUiStateFlags & SYSUI_STATE_ONE_HANDED_ACTIVE) != 0; + } + /** * Sets the region in screen space where the gestures should be deferred (ie. due to specific * nav bar ui). @@ -467,6 +488,28 @@ public class RecentsAnimationDeviceState implements && !isGestureBlockedActivity(task); } + /** + * One handed gestural in quickstep only active on NO_BUTTON, TWO_BUTTONS, and portrait mode + * + * @param ev The touch screen motion event. + * @return whether the given motion event can trigger the one handed mode. + */ + public boolean canTriggerOneHandedAction(MotionEvent ev) { + if (!sIsOneHandedEnabled) { + return false; + } + + final DefaultDisplay.Info displayInfo = mDefaultDisplay.getInfo(); + return (mRotationTouchHelper.touchInOneHandedModeRegion(ev) + && displayInfo.rotation != Surface.ROTATION_90 + && displayInfo.rotation != Surface.ROTATION_270 + && displayInfo.metrics.densityDpi < DisplayMetrics.DENSITY_600); + } + + private void onOneHandedEnabledSettingsChanged(boolean isOneHandedEnabled) { + sIsOneHandedEnabled = isOneHandedEnabled; + } + public RotationTouchHelper getRotationTouchHelper() { return mRotationTouchHelper; } diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java index 5f3c02205e..88a85bb118 100644 --- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java +++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java @@ -188,6 +188,10 @@ public class RotationTouchHelper implements return mOrientationTouchTransformer.touchInAssistantRegion(ev); } + public boolean touchInOneHandedModeRegion(MotionEvent ev) { + return mOrientationTouchTransformer.touchInOneHandedModeRegion(ev); + } + /** * Updates the regions for detecting the swipe up/quickswitch and assistant gestures. */ diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 299e9e5af1..72510a999a 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -352,10 +352,32 @@ public class SystemUiProxy implements ISystemUiProxy { if (mSystemUiProxy != null) { try { mSystemUiProxy.handleImageBundleAsScreenshot(screenImageBundle, locationInScreen, - visibleInsets, task); + visibleInsets, task); } catch (RemoteException e) { Log.w(TAG, "Failed call handleImageBundleAsScreenshot"); } } } + + @Override + public void startOneHandedMode() { + if (mSystemUiProxy != null) { + try { + mSystemUiProxy.startOneHandedMode(); + } catch (RemoteException e) { + Log.w(TAG, "Failed call startOneHandedMode", e); + } + } + } + + @Override + public void stopOneHandedMode() { + if (mSystemUiProxy != null) { + try { + mSystemUiProxy.stopOneHandedMode(); + } catch (RemoteException e) { + Log.w(TAG, "Failed call stopOneHandedMode", e); + } + } + } } diff --git a/src/com/android/launcher3/util/SecureSettingsObserver.java b/src/com/android/launcher3/util/SecureSettingsObserver.java index 48aa02b799..08a8e6d255 100644 --- a/src/com/android/launcher3/util/SecureSettingsObserver.java +++ b/src/com/android/launcher3/util/SecureSettingsObserver.java @@ -29,6 +29,8 @@ public class SecureSettingsObserver extends ContentObserver { /** Hidden field Settings.Secure.NOTIFICATION_BADGING */ public static final String NOTIFICATION_BADGING = "notification_badging"; + /** Hidden field Settings.Secure.ONE_HANDED_MODE_ENABLED */ + public static final String ONE_HANDED_ENABLED = "one_handed_mode_enabled"; private final ContentResolver mResolver; private final String mKeySetting; @@ -79,4 +81,10 @@ public class SecureSettingsObserver extends ContentObserver { return new SecureSettingsObserver( context.getContentResolver(), listener, NOTIFICATION_BADGING, 1); } + + public static SecureSettingsObserver newOneHandedSettingsObserver(Context context, + OnChangeListener listener) { + return new SecureSettingsObserver( + context.getContentResolver(), listener, ONE_HANDED_ENABLED, 1); + } }