| commit | 6466fcf8dbce022004a39985abe2587908ef3ad8 | [log] [tgz] |
|---|---|---|
| author | Tracy Zhou <tracyzhou@google.com> | Wed Jun 24 03:27:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 03:27:17 2020 +0000 |
| tree | 4feed280ef92ce6138ffad1085ca964ee945f034 | |
| parent | 34f04fe1df39724066781951997dee1a55694585 [diff] | |
| parent | 4853401c1c59dcc3067e1cdae19ab972a6ba5930 [diff] |
Merge "Revert "Disable grid option feature in ThemePicker"" into rvc-d1-dev am: 79e81dd799 am: 4853401c1c Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11975975 Change-Id: Icb1b06adb01ccd051186f1f416f31c28865f3878
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