Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dab972e9 authored by Paul Chang's avatar Paul Chang
Browse files

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
parent 063cf2f0

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>

































src/com/android/settings/bugreporthandler/BugReportHandlerPicker.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -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();









        }
































src/com/android/settings/development/BugReportHandlerPreferenceController.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -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 {