From dab972e95e8fbe71a499e22ac0c75d50ff8318d3 Mon Sep 17 00:00:00 2001
From: Paul Chang <changpa@google.com>
Date: Wed, 18 Dec 2019 13:09:08 +0800
Subject: [PATCH] Update System default handler title on Bug report handler
 settings

- Replace "Android System (Shell)" with "Android System"
- https://screenshot.googleplex.com/U3pxUHx3Uv0
- https://screenshot.googleplex.com/qKqqZUJM2w6

Bug: 143017534
Test: Flash device and check the title
Change-Id: I3036520d5887f70d1c43896eda56587d2ff9cdab
---
 res/values/strings.xml                                         | 3 ---
 .../settings/bugreporthandler/BugReportHandlerPicker.java      | 2 +-
 .../development/BugReportHandlerPreferenceController.java      | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ec073381742..b27a0f2bf09 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11405,9 +11405,6 @@
     <!-- 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>
-
     <!-- Developer settings: text for the bug report handler selection toast shown if an invalid bug report handler was chosen. [CHAR LIMIT=NONE] -->
     <string name="select_invalid_bug_report_handler_toast_text">This choice is no longer valid. Try again.</string>
 
diff --git a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
index 8dbb6c6e6ec..1db2b86bc09 100644
--- a/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
+++ b/src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
@@ -197,7 +197,7 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment {
                 return null;
             }
             if (BugReportHandlerUtil.SHELL_APP_PACKAGE.equals(packageItemInfo.packageName)) {
-                return mContext.getString(R.string.shell_app);
+                return mContext.getString(com.android.internal.R.string.android_system_label);
             }
             return super.loadLabel();
         }
diff --git a/src/com/android/settings/development/BugReportHandlerPreferenceController.java b/src/com/android/settings/development/BugReportHandlerPreferenceController.java
index b95d31bb18e..f1545371fa1 100644
--- a/src/com/android/settings/development/BugReportHandlerPreferenceController.java
+++ b/src/com/android/settings/development/BugReportHandlerPreferenceController.java
@@ -73,7 +73,7 @@ public class BugReportHandlerPreferenceController extends DeveloperOptionsPrefer
         final String handlerApp = mBugReportHandlerUtil.getCurrentBugReportHandlerAppAndUser(
                 mContext).first;
         if (BugReportHandlerUtil.SHELL_APP_PACKAGE.equals(handlerApp)) {
-            return mContext.getString(R.string.shell_app);
+            return mContext.getString(com.android.internal.R.string.android_system_label);
         }
         ApplicationInfo applicationInfo;
         try {