diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-15 02:09:38 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-15 02:09:38 +0000 |
commit | f7033f91c3ee3fea262401a6ac7b1e6111f367fb (patch) | |
tree | 67dd107eeacaa1ecc809184b04962eb4c7f3ac7a | |
parent | af648c78ebcedba86f5cf61506bd1783082cf2c0 (diff) | |
parent | 1845e6f98a74afab6004dd7dda7cc33d8c50407c (diff) | |
download | Launcher3-android-security-11.0.0_r65.tar.gz |
Merge cherrypicks of [16510921] into security-aosp-rvc-release.android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53
Change-Id: I737d8c90ec5c04bfc94342668cb7de7cc0ec4584
-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 e49f2ecdc0..a6c3015b92 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -30,6 +30,7 @@ <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" /> <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> + <uses-permission android:name="android.permission.ALLOW_SLIPPERY_TOUCHES"/> <uses-permission android:name="${packageName}.permission.HOTSEAT_EDU" /> <application diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java index 16bd9ed384..9e999790aa 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_DOWN; import static android.view.MotionEvent.ACTION_MOVE; import static android.view.MotionEvent.ACTION_UP; import static android.view.MotionEvent.ACTION_CANCEL; +import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY; import android.graphics.PointF; import android.util.SparseArray; @@ -48,17 +49,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; @@ -142,6 +132,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(); |