| commit | 2660d8ce21cd98bc3e1dd6187e53cb1ae9490889 | [log] [tgz] |
|---|---|---|
| author | Tracy Zhou <tracyzhou@google.com> | Tue Jun 23 23:21:45 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 23:21:45 2020 +0000 |
| tree | f5f2c67f61d3b98210e4dfa513dc87ea4b01c676 | |
| parent | 56c28b5e128565eee408652cc44b8fc6a43c9e27 [diff] | |
| parent | cb2473cf3f7f16feaff8078e3d04be59ec74d6b3 [diff] |
Merge "Disable grid option feature in ThemePicker" into rvc-dev am: cb2473cf3f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11972631 Change-Id: I97165e800e5dc275aeb4924f49f38ae90e4ab775
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index ff5bf0d..dd0fc21 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml
@@ -156,7 +156,8 @@ <provider android:name="com.android.launcher3.graphics.GridOptionsProvider" android:authorities="${packageName}.grid_control" - android:exported="true" /> + android:exported="true" + android:enabled="false" /> <!-- The settings activity. To extend point settings_fragment_name to appropriate fragment class