| commit | a468cbfa595b731b108a0b9d948b5aa24a9b138e | [log] [tgz] |
|---|---|---|
| author | Tracy Zhou <tracyzhou@google.com> | Tue Jun 23 23:40:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 23 23:40:47 2020 +0000 |
| tree | 75a30c0deb69ebcdc54da2c5212638eaad3c6e4a | |
| parent | 6a107f62aa7d9fd7752fa38b7af1f298e39d1cc2 [diff] | |
| parent | 15816e2cb3067f0e04653150f346d130bb105463 [diff] |
Merge "Disable grid option feature in ThemePicker" into rvc-dev am: cb2473cf3f am: 15816e2cb3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11972631 Change-Id: Ia64c4ff1b043f06d23708eb0e07d903c7b8bc4b7
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