Merge "Small fixes for TextClassifierImpl" (231cb066) · Commits · e / os / android_frameworks_base

core/java/android/view/textclassifier/TextClassifierImpl.java

+25 −26

Original line number	Diff line number	Diff line
		@@ -112,16 +112,17 @@ final class TextClassifierImpl implements TextClassifier {
		@Override
		public TextSelection suggestSelection(
		@NonNull CharSequence text, int selectionStartIndex, int selectionEndIndex,
		@NonNull TextSelection.Options options) {
		@Nullable TextSelection.Options options) {
		Utils.validateInput(text, selectionStartIndex, selectionEndIndex);
		try {
		if (text.length() > 0) {
		final LocaleList locales = (options == null) ? null : options.getDefaultLocales();
		final boolean darkLaunchAllowed = options != null && options.isDarkLaunchAllowed();
		final SmartSelection smartSelection = getSmartSelection(locales);
		final String string = text.toString();
		final int start;
		final int end;
		if (getSettings().isDarkLaunch() && !options.isDarkLaunchAllowed()) {
		if (getSettings().isDarkLaunch() && !darkLaunchAllowed) {
		start = selectionStartIndex;
		end = selectionEndIndex;
		} else {
		@@ -130,7 +131,7 @@ final class TextClassifierImpl implements TextClassifier {
		start = startEnd[0];
		end = startEnd[1];
		}
		if (start <= end
		if (start < end
		&& start >= 0 && end <= string.length()
		&& start <= selectionStartIndex && end >= selectionEndIndex) {
		final TextSelection.Builder tsBuilder = new TextSelection.Builder(start, end);
		@@ -165,18 +166,19 @@ final class TextClassifierImpl implements TextClassifier {
		@Override
		public TextClassification classifyText(
		@NonNull CharSequence text, int startIndex, int endIndex,
		@NonNull TextClassification.Options options) {
		@Nullable TextClassification.Options options) {
		Utils.validateInput(text, startIndex, endIndex);
		try {
		if (text.length() > 0) {
		final String string = text.toString();
		final LocaleList locales = (options == null) ? null : options.getDefaultLocales();
		final Calendar refTime = (options == null) ? null : options.getReferenceTime();
		final SmartSelection.ClassificationResult[] results = getSmartSelection(locales)
		.classifyText(string, startIndex, endIndex,
		getHintFlags(string, startIndex, endIndex));
		if (results.length > 0) {
		return createClassificationResult(
		results, string, startIndex, endIndex, options.getReferenceTime());
		results, string, startIndex, endIndex, refTime);
		}
		}
		} catch (Throwable t) {
		@@ -641,12 +643,11 @@ final class TextClassifierImpl implements TextClassifier {
		case Intent.ACTION_DIAL:
		return context.getString(com.android.internal.R.string.dial);
		case Intent.ACTION_SENDTO:
		switch (intent.getScheme()) {
		case "mailto":
		if ("mailto".equals(intent.getScheme())) {
		return context.getString(com.android.internal.R.string.email);
		case "smsto":
		} else if ("smsto".equals(intent.getScheme())) {
		return context.getString(com.android.internal.R.string.sms);
		default:
		} else {
		return null;
		}
		case Intent.ACTION_INSERT:
		@@ -655,23 +656,21 @@ final class TextClassifierImpl implements TextClassifier {
		}
		return null;
		case Intent.ACTION_INSERT_OR_EDIT:
		switch (intent.getDataString()) {
		case ContactsContract.Contacts.CONTENT_ITEM_TYPE:
		if (ContactsContract.Contacts.CONTENT_ITEM_TYPE.equals(
		intent.getType())) {
		return context.getString(com.android.internal.R.string.add_contact);
		default:
		} else {
		return null;
		}
		case Intent.ACTION_VIEW:
		if (CalendarContract.AUTHORITY.equals(authority)) {
		return context.getString(com.android.internal.R.string.view_calendar);
		}
		switch (intent.getScheme()) {
		case "geo":
		} else if ("geo".equals(intent.getScheme())) {
		return context.getString(com.android.internal.R.string.map);
		case "http": // fall through
		case "https":
		} else if ("http".equals(intent.getScheme())
		\|\| "https".equals(intent.getScheme())) {
		return context.getString(com.android.internal.R.string.browse);
		default:
		} else {
		return null;
		}
		case Intent.ACTION_WEB_SEARCH: