| commit | 2d062629afad6d80c861b2d7fd030d0c1271ddc7 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 25 17:13:03 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 25 17:13:03 2020 +0000 |
| tree | 607aa6becbd3e0c6868cbbf72a92c6ed8821b600 | |
| parent | a04df0eeff55261d0b96deb597649883370f85c1 [diff] | |
| parent | a2c80c2a1ea9337eab41c8212e187e41244a8597 [diff] |
Merge "Pass isLikelyToStartNewTask to onGestureStarted()" into rvc-dev am: ccf588d36b am: a2c80c2a1e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11994586 Change-Id: I68707d6786ccb793f7ed89e649bea55a5a3f1005
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