am da01da17: Merge "Do not turn on imes unexpectedly with unit tests" (fc14e1c7) · Commits · e / os / android_frameworks_base

core/java/android/view/inputmethod/InputMethodInfo.java

+50 −6

Original line number	Diff line number	Diff line
		@@ -80,6 +80,11 @@ public final class InputMethodInfo implements Parcelable {

		private boolean mIsAuxIme;

		/**
		* Cavert: mForceDefault must be false for production. This flag is only for test.
		*/
		private final boolean mForceDefault;

		/**
		* Constructor.
		*
		@@ -108,6 +113,7 @@ public final class InputMethodInfo implements Parcelable {
		ServiceInfo si = service.serviceInfo;
		mId = new ComponentName(si.packageName, si.name).flattenToShortString();
		mIsAuxIme = true;
		mForceDefault = false;

		PackageManager pm = context.getPackageManager();
		String settingsActivityComponent = null;
		@@ -215,13 +221,39 @@ public final class InputMethodInfo implements Parcelable {
		mIsAuxIme = source.readInt() == 1;
		mService = ResolveInfo.CREATOR.createFromParcel(source);
		source.readTypedList(mSubtypes, InputMethodSubtype.CREATOR);
		mForceDefault = false;
		}

		/**
		* Temporary API for creating a built-in input method.
		* Temporary API for creating a built-in input method for test.
		*/
		public InputMethodInfo(String packageName, String className,
		CharSequence label, String settingsActivity) {
		this(buildDummyResolveInfo(packageName, className, label), false, settingsActivity, null,
		0, false);
		}

		/**
		* Temporary API for creating a built-in input method for test.
		* @hide
		*/
		public InputMethodInfo(ResolveInfo ri, boolean isAuxIme,
		String settingsActivity, List<InputMethodSubtype> subtypes, int isDefaultResId,
		boolean forceDefault) {
		final ServiceInfo si = ri.serviceInfo;
		mService = ri;
		mId = new ComponentName(si.packageName, si.name).flattenToShortString();
		mSettingsActivityName = settingsActivity;
		mIsDefaultResId = isDefaultResId;
		mIsAuxIme = isAuxIme;
		if (subtypes != null) {
		mSubtypes.addAll(subtypes);
		}
		mForceDefault = forceDefault;
		}

		private static ResolveInfo buildDummyResolveInfo(String packageName, String className,
		CharSequence label) {
		ResolveInfo ri = new ResolveInfo();
		ServiceInfo si = new ServiceInfo();
		ApplicationInfo ai = new ApplicationInfo();
		@@ -234,11 +266,7 @@ public final class InputMethodInfo implements Parcelable {
		si.exported = true;
		si.nonLocalizedLabel = label;
		ri.serviceInfo = si;
		mService = ri;
		mId = new ComponentName(si.packageName, si.name).flattenToShortString();
		mSettingsActivityName = settingsActivity;
		mIsDefaultResId = 0;
		mIsAuxIme = false;
		return ri;
		}

		/**
		@@ -340,6 +368,22 @@ public final class InputMethodInfo implements Parcelable {
		return mIsDefaultResId;
		}

		/**
		* Return whether or not this ime is a default ime or not.
		* @hide
		*/
		public boolean isDefault(Context context) {
		if (mForceDefault) {
		return true;
		}
		try {
		final Resources res = context.createPackageContext(getPackageName(), 0).getResources();
		return res.getBoolean(getIsDefaultResourceId());
		} catch (NameNotFoundException e) {
		return false;
		}
		}

		public void dump(Printer pw, String prefix) {
		pw.println(prefix + "mId=" + mId
		+ " mSettingsActivityName=" + mSettingsActivityName);

core/java/com/android/internal/inputmethod/InputMethodUtils.java

+56 −13

Original line number	Diff line number	Diff line
		@@ -59,11 +59,53 @@ public class InputMethodUtils {
		& ApplicationInfo.FLAG_SYSTEM) != 0;
		}

		public static boolean isSystemImeThatHasEnglishSubtype(InputMethodInfo imi) {
		public static boolean isSystemImeThatHasEnglishKeyboardSubtype(InputMethodInfo imi) {
		if (!isSystemIme(imi)) {
		return false;
		}
		return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage());
		return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage(), SUBTYPE_MODE_KEYBOARD);
		}

		private static boolean isSystemAuxilialyImeThatHashAutomaticSubtype(InputMethodInfo imi) {
		if (!isSystemIme(imi)) {
		return false;
		}
		if (!imi.isAuxiliaryIme()) {
		return false;
		}
		final int subtypeCount = imi.getSubtypeCount();
		for (int i = 0; i < subtypeCount; ++i) {
		final InputMethodSubtype s = imi.getSubtypeAt(i);
		if (s.overridesImplicitlyEnabledSubtype()) {
		return true;
		}
		}
		return false;
		}

		public static ArrayList<InputMethodInfo> getDefaultEnabledImes(
		Context context, boolean isSystemReady, ArrayList<InputMethodInfo> imis) {
		final ArrayList<InputMethodInfo> retval = new ArrayList<InputMethodInfo>();
		boolean auxilialyImeAdded = false;
		for (int i = 0; i < imis.size(); ++i) {
		final InputMethodInfo imi = imis.get(i);
		if (isDefaultEnabledIme(isSystemReady, imi, context)) {
		retval.add(imi);
		if (imi.isAuxiliaryIme()) {
		auxilialyImeAdded = true;
		}
		}
		}
		if (auxilialyImeAdded) {
		return retval;
		}
		for (int i = 0; i < imis.size(); ++i) {
		final InputMethodInfo imi = imis.get(i);
		if (isSystemAuxilialyImeThatHashAutomaticSubtype(imi)) {
		retval.add(imi);
		}
		}
		return retval;
		}

		// TODO: Rename isSystemDefaultImeThatHasCurrentLanguageSubtype
		@@ -77,14 +119,11 @@ public class InputMethodUtils {
		}
		if (imi.getIsDefaultResourceId() != 0) {
		try {
		Resources res = context.createPackageContext(
		imi.getPackageName(), 0).getResources();
		if (res.getBoolean(imi.getIsDefaultResourceId())
		&& containsSubtypeOf(imi, context.getResources().getConfiguration().
		locale.getLanguage())) {
		if (imi.isDefault(context) && containsSubtypeOf(
		imi, context.getResources().getConfiguration().locale.getLanguage(),
		null /* mode */)) {
		return true;
		}
		} catch (PackageManager.NameNotFoundException ex) {
		} catch (Resources.NotFoundException ex) {
		}
		}
		@@ -97,15 +136,19 @@ public class InputMethodUtils {
		public static boolean isDefaultEnabledIme(
		boolean isSystemReady, InputMethodInfo imi, Context context) {
		return isValidSystemDefaultIme(isSystemReady, imi, context)
		\|\| isSystemImeThatHasEnglishSubtype(imi);
		\|\| isSystemImeThatHasEnglishKeyboardSubtype(imi);
		}

		private static boolean containsSubtypeOf(InputMethodInfo imi, String language) {
		private static boolean containsSubtypeOf(InputMethodInfo imi, String language, String mode) {
		final int N = imi.getSubtypeCount();
		for (int i = 0; i < N; ++i) {
		if (imi.getSubtypeAt(i).getLocale().startsWith(language)) {
		return true;
		if (!imi.getSubtypeAt(i).getLocale().startsWith(language)) {
		continue;
		}
		if(!TextUtils.isEmpty(mode) && !imi.getSubtypeAt(i).getMode().equalsIgnoreCase(mode)) {
		continue;
		}
		return true;
		}
		return false;
		}
		@@ -141,7 +184,7 @@ public class InputMethodUtils {
		while (i > 0) {
		i--;
		final InputMethodInfo imi = enabledImes.get(i);
		if (InputMethodUtils.isSystemImeThatHasEnglishSubtype(imi)
		if (InputMethodUtils.isSystemImeThatHasEnglishKeyboardSubtype(imi)
		&& !imi.isAuxiliaryIme()) {
		return imi;
		}

core/tests/inputmethodtests/Android.mk

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		# We only want this apk build for tests.
		LOCAL_MODULE_TAGS := tests

		# Include all test java files.
		LOCAL_SRC_FILES := \
		$(call all-java-files-under, src)

		LOCAL_DX_FLAGS := --core-library
		LOCAL_STATIC_JAVA_LIBRARIES := core-tests android-common frameworks-core-util-lib
		LOCAL_JAVA_LIBRARIES := android.test.runner
		LOCAL_PACKAGE_NAME := FrameworksCoreInputMethodTests

		LOCAL_CERTIFICATE := platform

		include $(BUILD_PACKAGE)

core/tests/inputmethodtests/AndroidManifest.xml

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- 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.
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		android:installLocation="internalOnly"
		package="com.android.frameworks.coretests.inputmethod"
		android:sharedUserId="android.uid.system">

		<application>
		<uses-library android:name="android.test.runner" />
		</application>

		<instrumentation android:name="android.test.InstrumentationTestRunner"
		android:targetPackage="com.android.frameworks.coretests.inputmethod"
		android:label="Frameworks InputMethod Core Tests" />

		</manifest>

core/tests/inputmethodtests/run_core_inputmethod_test.sh

0 → 100755

+24 −0

Original line number	Diff line number	Diff line
		#!/bin/bash

		while [[ $# -gt 0 ]]; do
		case "$1" in
		--rebuild ) echo Rebuild && rebuild=true;;
		* ) com_opts+=($1);;
		esac
		shift
		done

		if [[ -z $ANDROID_PRODUCT_OUT && $rebuilld == true ]]; then
		echo You must lunch before running this test.
		exit 0
		fi

		if [[ $rebuild == true ]]; then
		make -j4 FrameworksCoreInputMethodTests
		TESTAPP=${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreInputMethodTests.apk
		COMMAND="adb install -r $TESTAPP"
		echo $COMMAND
		$COMMAND
		fi

		adb shell am instrument -w -e class android.os.InputMethodTest com.android.frameworks.coretests.inputmethod/android.test.InstrumentationTestRunner