diff options
author | Siarhei Vishniakou <svv@google.com> | 2021-11-22 16:00:09 -0800 |
---|---|---|
committer | Siarhei Vishniakou <svv@google.com> | 2021-12-12 06:22:08 +0000 |
commit | 81ff81227e26d08779f176ed40fc2bed1cb9a912 (patch) | |
tree | a1a60a30619ec5c9441c2ab28ed63e56e3ec96c7 | |
parent | 3e39786ec3f35ec9297003a54f4439af7d198a36 (diff) | |
download | Launcher3-81ff81227e26d08779f176ed40fc2bed1cb9a912.tar.gz |
Add ALLOW_SLIPPERY_TOUCHES to make StatusBarTouchController slippery
LauncherActivity uses FLAG_SLIPPERY for certain interactions. For
example, when home screen is shown, and the user pulls down from not the
top of the screen, and notification shade is getting displayed, then the
touch should be getting transferred to the NotificationShade using
FLAG_SLIPPERY.
The newly introduced permission is added to launcher in order for this
flag to be applied to the window.
Bug: 206188649
Bug: 157929241
Test: reviewed logs, ensure that NexusLauncherActivity has FLAG_SLIPPERY
Test: re-ran the performance regression test
Change-Id: I8d05fa3663687b5382a59b0d47cdac404844c3b7
-rw-r--r-- | quickstep/AndroidManifest.xml | 1 | ||||
-rw-r--r-- | quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java | 21 |
2 files changed, 11 insertions, 11 deletions
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index b43d8d1a4b..f82080feea 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -40,6 +40,7 @@ <uses-permission android:name="android.permission.READ_FRAME_BUFFER"/> <uses-permission android:name="android.permission.MANAGE_ACCESSIBILITY"/> <uses-permission android:name="android.permission.MONITOR_INPUT"/> + <uses-permission android:name="android.permission.ALLOW_SLIPPERY_TOUCHES"/> <uses-permission android:name="${packageName}.permission.HOTSEAT_EDU" /> <uses-permission android:name="android.permission.SYSTEM_APPLICATION_OVERLAY" /> diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java index fe69c9b87d..1bc789bd6e 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java @@ -19,6 +19,7 @@ import static android.view.MotionEvent.ACTION_CANCEL; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_MOVE; import static android.view.MotionEvent.ACTION_UP; +import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_SWIPE_DOWN_WORKSPACE_NOTISHADE_OPEN; @@ -47,17 +48,6 @@ public class StatusBarTouchController implements TouchController { private static final String TAG = "StatusBarController"; - /** - * Window flag: Enable touches to slide out of a window into neighboring - * windows in mid-gesture instead of being captured for the duration of - * the gesture. - * - * This flag changes the behavior of touch focus for this window only. - * Touches can slide out of the window but they cannot necessarily slide - * back in (unless the other window with touch focus permits it). - */ - private static final int FLAG_SLIPPERY = 0x20000000; - private final Launcher mLauncher; private final SystemUiProxy mSystemUiProxy; private final float mTouchSlop; @@ -140,6 +130,15 @@ public class StatusBarTouchController implements TouchController { return true; } + /** + * FLAG_SLIPPERY enables touches to slide out of a window into neighboring + * windows in mid-gesture instead of being captured for the duration of + * the gesture. + * + * This flag changes the behavior of touch focus for this window only. + * Touches can slide out of the window but they cannot necessarily slide + * back in (unless the other window with touch focus permits it). + */ private void setWindowSlippery(boolean enable) { Window w = mLauncher.getWindow(); WindowManager.LayoutParams wlp = w.getAttributes(); |