| commit | f220a3c6eb6f005abe220ac44f2301cb69f846dd | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 24 05:04:19 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 05:04:19 2020 +0000 |
| tree | 4fda50ac1d7d65f25254a282cf7d104f7e855769 | |
| parent | 373d9f4d887dc23469c892b16056cd774e548f2f [diff] | |
| parent | 968b52bd4cb5ba211e1d06e437558637dc92988d [diff] |
Merge "Remove hotseat edu flag" into rvc-dev am: d6cd14d179 am: 968b52bd4c Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11979630 Change-Id: Ib31f1a9082e462194342c39ed7e23f17d0e09c5b
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