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