PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update System default handler title on Bug report handler settings

Browse Source 
- 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
This commit is contained in:
Paul Chang
2019-12-18 13:09:08 +08:00
parent 063cf2f059
commit dab972e95e
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -11405,9 +11405,6 @@
<!-- Subtext of system default app for current setting [CHAR LIMIT=NONE] --> <!-- Subtext of system default app for current setting [CHAR LIMIT=NONE] -->
<string name="system_default_app_subtext">System default</string> <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] --> <!-- 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> <string name="select_invalid_bug_report_handler_toast_text">This choice is no longer valid. Try again.</string>

2
src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java
View File

@@ -197,7 +197,7 @@ public class BugReportHandlerPicker extends DefaultAppPickerFragment {
return null; return null;
} }
if (BugReportHandlerUtil.SHELL_APP_PACKAGE.equals(packageItemInfo.packageName)) { 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(); return super.loadLabel();
} }

2
src/com/android/settings/development/BugReportHandlerPreferenceController.java
View File

@@ -73,7 +73,7 @@ public class BugReportHandlerPreferenceController extends DeveloperOptionsPrefer
final String handlerApp = mBugReportHandlerUtil.getCurrentBugReportHandlerAppAndUser( final String handlerApp = mBugReportHandlerUtil.getCurrentBugReportHandlerAppAndUser(
mContext).first; mContext).first;
if (BugReportHandlerUtil.SHELL_APP_PACKAGE.equals(handlerApp)) { 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; ApplicationInfo applicationInfo;
try { try {