| commit | 6be2c6cb83e7363a8f13692167169d02448cea6d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 25 16:49:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 25 16:49:17 2020 +0000 |
| tree | 9ecd43ad05bed178541808d094f5d20786540a9c | |
| parent | 3fef2dd92d603fe5e5454eca4cd84857725d78b3 [diff] | |
| parent | ccf588d36b8539ef193272fce6e9b66f3f8ff644 [diff] |
Merge "Pass isLikelyToStartNewTask to onGestureStarted()" into rvc-dev am: ccf588d36b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11994586 Change-Id: If5bd4173783df2ffa89062dece3b0a6b1aa1ffe7
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index dd0fc21..ff5bf0d 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml
@@ -156,8 +156,7 @@ <provider android:name="com.android.launcher3.graphics.GridOptionsProvider" android:authorities="${packageName}.grid_control" - android:exported="true" - android:enabled="false" /> + android:exported="true" /> <!-- The settings activity. To extend point settings_fragment_name to appropriate fragment class