From 2ceaf8d86cd9e3f9cb1ac2de11703ff36a6a9393 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Tue, 19 Feb 2019 13:00:59 -0800
Subject: [PATCH] Add visibility config for assistant, home and emergency role.

Default assistant, home and emergency could be hidden from users, so
keep this ability when we migrate to roles.

Bug: 124452117
Bug: 124260975
Test: manual
Change-Id: I8408c6eb56e39f2dc7b38e61d27418efcba9010a
---
 api/system-current.txt         | 3 +++
 core/res/res/values/config.xml | 6 ++++++
 core/res/res/values/public.xml | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 128ee99c27add..b6d513d6a2a8e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -216,6 +216,9 @@ package android {
 
   public static final class R.bool {
     field public static final int config_sendPackageName = 17891328; // 0x1110000
+    field public static final int config_showDefaultAssistant = 17891329; // 0x1110001
+    field public static final int config_showDefaultEmergency = 17891330; // 0x1110002
+    field public static final int config_showDefaultHome = 17891331; // 0x1110003
   }
 
   public static final class R.color {
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index e65e7da57e58c..6571cd2645832 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1948,12 +1948,18 @@
 
     <!-- The name of the package that will hold the assistant role by default. -->
     <string name="config_defaultAssistant" translatable="false" />
+    <!-- Whether the default assistant settings should be shown. -->
+    <bool name="config_showDefaultAssistant">true</bool>
     <!-- The name of the package that will hold the browser role by default. -->
     <string name="config_defaultBrowser" translatable="false">@string/default_browser</string>
     <!-- The name of the package that will hold the dialer role by default. -->
     <string name="config_defaultDialer" translatable="false">com.android.phone</string>
     <!-- The name of the package that will hold the SMS role by default. -->
     <string name="config_defaultSms" translatable="false">@string/default_sms_application</string>
+    <!-- Whether the default emergency settings should be shown. -->
+    <bool name="config_showDefaultEmergency">false</bool>
+    <!-- Whether the default home settings should be shown. -->
+    <bool name="config_showDefaultHome">true</bool>
     <!-- The name of the package that will hold the music role by default. -->
     <string name="config_defaultMusic" translatable="false">com.android.music</string>
     <!-- The name of the package that will hold the gallery role by default. -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 3580dd475ab9f..e1ce2f69ba70d 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2992,6 +2992,12 @@
     <public-group type="bool" first-id="0x01110000">
         <!-- @hide @SystemApi -->
         <public name="config_sendPackageName" />
+      <!-- @hide @SystemApi -->
+      <public name="config_showDefaultAssistant" />
+      <!-- @hide @SystemApi -->
+      <public name="config_showDefaultEmergency" />
+      <!-- @hide @SystemApi -->
+      <public name="config_showDefaultHome" />
     </public-group>
 
     <public-group type="dimen" first-id="0x01050007">