Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev (0c57f69f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java

+14 −4

Original line number	Diff line number	Diff line
		@@ -322,6 +322,18 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted
		getComponentName());
		};

		private static CharSequence getSoftwareShortcutTypeSummary(Context context) {
		int resId;
		if (AccessibilityUtil.isFloatingMenuEnabled(context)) {
		resId = R.string.accessibility_shortcut_edit_summary_software;
		} else if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
		resId = R.string.accessibility_shortcut_edit_summary_software_gesture;
		} else {
		resId = R.string.accessibility_shortcut_edit_summary_software;
		}
		return context.getText(resId);
		}

		/**
		* This method will be invoked when a button in the tutorial dialog is clicked.
		*
		@@ -429,11 +441,9 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted
		getComponentName().flattenToString(), AccessibilityUtil.UserShortcutType.SOFTWARE);

		final List<CharSequence> list = new ArrayList<>();
		final CharSequence softwareTitle = context.getText(
		R.string.accessibility_shortcut_edit_summary_software);

		if (hasShortcutType(shortcutTypes, AccessibilityUtil.UserShortcutType.SOFTWARE)) {
		list.add(softwareTitle);
		list.add(getSoftwareShortcutTypeSummary(context));
		}
		if (hasShortcutType(shortcutTypes, AccessibilityUtil.UserShortcutType.HARDWARE)) {
		final CharSequence hardwareTitle = context.getText(
		@@ -443,7 +453,7 @@ public abstract class AccessibilityShortcutPreferenceFragment extends Restricted

		// Show software shortcut if first time to use.
		if (list.isEmpty()) {
		list.add(softwareTitle);
		list.add(getSoftwareShortcutTypeSummary(context));
		}

		return CaseMap.toTitle().wholeString().noLowercase().apply(Locale.getDefault(), /* iter= */