From 45ca77862f92e046e0ab488f85423ff18a32a8b4 Mon Sep 17 00:00:00 2001
From: Paul Chang <changpa@google.com>
Date: Wed, 18 Dec 2019 09:26:30 +0800
Subject: [PATCH] Update subtext UI on Bug report handler settings

- Remove parentheses of the subtext on Bug report handler settings
- https://screenshot.googleplex.com/TOO4FuW7O8Y

BUG: 143017534
Test: Flash device and check the subtext
Change-Id: Ia3bee7e87a763fc776f846a03ce380e583308e1d
---
 res/values/strings.xml                                | 11 +++++++----
 .../bugreporthandler/BugReportHandlerPicker.java      |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 177e2c10fa1..5a6c9ec565c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11378,11 +11378,14 @@
     <!-- Developer Settings: Footer text for bug report handler picker [CHAR LIMIT=NONE] -->
     <string name="bug_report_handler_picker_footer_text">Determines which app handles the Bug Report shortcut on your device.</string>
 
-    <!-- Label of personal profile app for current setting [CHAR LIMIT=NONE] -->
-    <string name="personal_profile_app">(Personal)</string>
+    <!-- Subtext of personal profile app for current setting [CHAR LIMIT=NONE] -->
+    <string name="personal_profile_app_subtext">Personal</string>
 
-    <!-- Label of work profile app for current setting [CHAR LIMIT=NONE] -->
-    <string name="work_profile_app">(Work)</string>
+    <!-- Subtext of work profile app for current setting [CHAR LIMIT=NONE] -->
+    <string name="work_profile_app_subtext">Work</string>
+
+    <!-- Subtext of system default app for current setting [CHAR LIMIT=NONE] -->
+    <string name="system_default_app_subtext">System default</string>
 
     <!-- Title of Shell app for current setting [CHAR LIMIT=NONE] -->
     <string name="shell_app">Android System (Shell)</string>
diff --git a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
index 9c2ac9e6c83..8dbb6c6e6ec 100644
--- a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
+++ b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
@@ -164,13 +164,13 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment {
     private String getDescription(String handlerApp, int handlerUser) {
         final Context context = getContext();
         if (BugReportHandlerUtil.SHELL_APP_PACKAGE.equals(handlerApp)) {
-            return context.getString(R.string.system_default_app);
+            return context.getString(R.string.system_default_app_subtext);
         }
         final UserHandle managedProfile = Utils.getManagedProfile(mUserManager);
         if (managedProfile != null && managedProfile.getIdentifier() == handlerUser) {
-            return context.getString(R.string.work_profile_app);
+            return context.getString(R.string.work_profile_app_subtext);
         }
-        return context.getString(R.string.personal_profile_app);
+        return context.getString(R.string.personal_profile_app_subtext);
     }
 
     private static class BugreportHandlerAppInfo extends DefaultAppInfo {