Separate IntentUtils from CompatUtils (298b4240) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/compat/CompatUtils.java

+2 −17

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.inputmethod.compat;

		import android.content.Intent;
		import android.text.TextUtils;
		import android.util.Log;

		@@ -26,23 +25,9 @@ import java.lang.reflect.Method;

		public final class CompatUtils {
		private static final String TAG = CompatUtils.class.getSimpleName();
		private static final String EXTRA_INPUT_METHOD_ID = "input_method_id";
		// TODO: Can these be constants instead of literal String constants?
		private static final String INPUT_METHOD_SUBTYPE_SETTINGS =
		"android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";

		public static Intent getInputLanguageSelectionIntent(final String inputMethodId,
		final int flagsForSubtypeSettings) {
		// Refer to android.provider.Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
		final String action = INPUT_METHOD_SUBTYPE_SETTINGS;
		final Intent intent = new Intent(action);
		if (!TextUtils.isEmpty(inputMethodId)) {
		intent.putExtra(EXTRA_INPUT_METHOD_ID, inputMethodId);
		}
		if (flagsForSubtypeSettings > 0) {
		intent.setFlags(flagsForSubtypeSettings);
		}
		return intent;
		private CompatUtils() {
		// This utility class is not publicly instantiable.
		}

		public static Class<?> getClass(final String className) {

java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -44,8 +44,6 @@ import android.widget.Spinner;
		import android.widget.SpinnerAdapter;
		import android.widget.Toast;

		import com.android.inputmethod.compat.CompatUtils;

		import java.util.ArrayList;
		import java.util.TreeSet;

		@@ -519,7 +517,7 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment {
		.setPositiveButton(R.string.enable, new DialogInterface.OnClickListener() {
		@Override
		public void onClick(DialogInterface dialog, int which) {
		final Intent intent = CompatUtils.getInputLanguageSelectionIntent(
		final Intent intent = IntentUtils.getInputLanguageSelectionIntent(
		mRichImm.getInputMethodIdOfThisIme(),
		Intent.FLAG_ACTIVITY_NEW_TASK
		\| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED

java/src/com/android/inputmethod/latin/IntentUtils.java

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.inputmethod.latin;

		import android.content.Intent;
		import android.text.TextUtils;

		public final class IntentUtils {
		private static final String EXTRA_INPUT_METHOD_ID = "input_method_id";
		// TODO: Can these be constants instead of literal String constants?
		private static final String INPUT_METHOD_SUBTYPE_SETTINGS =
		"android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";

		private IntentUtils() {
		// This utility class is not publicly instantiable.
		}

		public static Intent getInputLanguageSelectionIntent(final String inputMethodId,
		final int flagsForSubtypeSettings) {
		// Refer to android.provider.Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
		final String action = INPUT_METHOD_SUBTYPE_SETTINGS;
		final Intent intent = new Intent(action);
		if (!TextUtils.isEmpty(inputMethodId)) {
		intent.putExtra(EXTRA_INPUT_METHOD_ID, inputMethodId);
		}
		if (flagsForSubtypeSettings > 0) {
		intent.setFlags(flagsForSubtypeSettings);
		}
		return intent;
		}
		}

java/src/com/android/inputmethod/latin/LatinIME.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ import android.view.inputmethod.InputMethodSubtype;
		import com.android.inputmethod.accessibility.AccessibilityUtils;
		import com.android.inputmethod.accessibility.AccessibleKeyboardViewProxy;
		import com.android.inputmethod.annotations.UsedForTesting;
		import com.android.inputmethod.compat.CompatUtils;
		import com.android.inputmethod.compat.InputMethodServiceCompatUtils;
		import com.android.inputmethod.compat.SuggestionSpanUtils;
		import com.android.inputmethod.event.EventInterpreter;
		@@ -2512,7 +2511,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
		di.dismiss();
		switch (position) {
		case 0:
		Intent intent = CompatUtils.getInputLanguageSelectionIntent(
		final Intent intent = IntentUtils.getInputLanguageSelectionIntent(
		mRichImm.getInputMethodIdOfThisIme(),
		Intent.FLAG_ACTIVITY_NEW_TASK
		\| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED