From 7afa69d43856915f01a31db69214886abc8bddff Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Tue, 23 Jun 2020 23:10:19 +0000
Subject: [PATCH] Revert "Disable grid option feature in ThemePicker"

This reverts commit 0c8823896677f91e16b5fcbd374a3d2ca3e801d3.

Reason for revert: Disable grid in rvc-dev, and revert this change in rvc-d1-dev.

Bug: 158790001

Change-Id: Id19579b87d0a83424be794cbac95b7df3fd67131
---
 AndroidManifest-common.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index dd0fc219ad..ff5bf0d1e5 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