| commit | e65a33134d20e338d9eb5cc6b17496d519593fee | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 24 04:53:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 04:53:00 2020 +0000 |
| tree | 3675119052cf3cd64894b15ecc1e3367603ae6cf | |
| parent | c588af043c6d7829a6e55a01dc583a016b456571 [diff] | |
| parent | d6cd14d1792107c5ff609edb1f3bb65f525abba8 [diff] |
Merge "Remove hotseat edu flag" into rvc-dev am: d6cd14d179 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11979630 Change-Id: I1d29e2f3c79905889aad361a149de4dba5b05274
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