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