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

Commit 70133b36 authored Dec 18, 2019 by Paul Chang Committed by Android (Google) Code Review Dec 18, 2019

Merge "Update System default handler title on Bug report handler settings"

parents b945785d dab972e9

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 {