commit | 3af603f2402a82a94513b7688170ae093d580212 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 24 07:09:46 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 07:09:46 2020 +0000 |
tree | 13f0e330990559ab6612daa0767232b2607abc49 | |
parent | e65a33134d20e338d9eb5cc6b17496d519593fee [diff] | |
parent | ca493d1426e35aa18b20c102ce1b479930780027 [diff] |
Merge "Fixing NPE befre ActionsView first initialized." into rvc-dev am: ca493d1426 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11978215 Change-Id: I68378ceec09b495b25568571474f2f4b295388d2
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