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