| commit | 726159272b6b2ac1ef9832e604e32a144060eb1b | [log] [tgz] |
|---|---|---|
| author | Tracy Zhou <tracyzhou@google.com> | Wed Jun 24 03:46:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 03:46:21 2020 +0000 |
| tree | ba06b479d8fb46c79a5876e2b7d76e7ba8f48dae | |
| parent | 18575b5c7769fad55be99c559022995f08c61901 [diff] | |
| parent | 6466fcf8dbce022004a39985abe2587908ef3ad8 [diff] |
Merge "Revert "Disable grid option feature in ThemePicker"" into rvc-d1-dev am: 79e81dd799 am: 4853401c1c am: 6466fcf8db Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11975975 Change-Id: I2f8922d217cbd566e419cb978b25d0e8925df738
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index d3216c1..84dd06a 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml
@@ -161,8 +161,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