| commit | fc49c2c54a669b1299dfdc8acda061a66c4d6bc1 | [log] [tgz] |
|---|---|---|
| author | Thiru Ramasamy <thiruram@google.com> | Mon Jun 29 23:51:39 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 29 23:51:39 2020 +0000 |
| tree | 36042b552b7ceeec3409e537fab460d0c59a8ddd | |
| parent | 987ba0261f9de50af682ce40c0fb5fdc2699119f [diff] | |
| parent | 6f5d4bb8ab5cee74de5b82e8db2c2957cbda3296 [diff] |
Merge "Fixes NPE with system shortcuts." into rvc-dev am: 6f5d4bb8ab Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12035575 Change-Id: Iab463bb1eadf656973f7ee8ccbcd32dbbc056101
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