diff options
| author | Mehdi Alizadeh <mett@google.com> | 2020-06-17 00:04:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 00:04:18 +0000 |
| commit | c89052a4fa20efcc86a798d24337dec91beb4481 (patch) | |
| tree | e1eb9ae8984624ad0f5583f8511f90a644339648 | |
| parent | 48de0d1ce700c0ace53d9988b1d41f6a65661d31 (diff) | |
| parent | 296b9dcbe3300c514ecfde44c8f7eb7428e472ae (diff) | |
| download | Settings-c89052a4fa20efcc86a798d24337dec91beb4481.tar.gz | |
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a am: eab293354a am: 4d896e3da8 am: 296b9dcbe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: Ia1e671d00528170aad8b960ed3704fb25e407900
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | src/com/android/settings/gestures/BackGestureIndicatorView.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 12027417bcf..59e7d0d1eb5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -103,7 +103,8 @@ <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" /> <uses-permission android:name="android.permission.INSTALL_DYNAMIC_SYSTEM" /> <uses-permission android:name="android.permission.BIND_CELL_BROADCAST_SERVICE" /> - + <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> + <application android:label="@string/settings_label" android:icon="@drawable/ic_launcher_settings" android:theme="@style/Theme.Settings" diff --git a/src/com/android/settings/gestures/BackGestureIndicatorView.java b/src/com/android/settings/gestures/BackGestureIndicatorView.java index 9d0e74387d4..c60afd003d3 100644 --- a/src/com/android/settings/gestures/BackGestureIndicatorView.java +++ b/src/com/android/settings/gestures/BackGestureIndicatorView.java @@ -92,9 +92,7 @@ public class BackGestureIndicatorView extends LinearLayout { int copiedFlags = (parentWindowAttributes.flags & WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); final WindowManager.LayoutParams lp = new WindowManager.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.TYPE_APPLICATION, + WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY, WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE |