| commit | 6118bad6f3f78c3b9e27b072296d97879e28730e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 24 03:58:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 03:58:02 2020 +0000 |
| tree | b09ce6ed2b4a44565f1c782e9d526b198783deca | |
| parent | bd041b06228d24e75b66d55b5f4df121ae43c844 [diff] | |
| parent | 9aadcc0d6c2aa5dccf706237e70cfc8eeefc8003 [diff] |
Merge "Use isolated display context to get display info" into rvc-dev am: 7f5a670cc3 am: 9aadcc0d6c Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11969858 Change-Id: I4ad486774fd85e6c0d5f97ed42bb2aab289ade47
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