Merge "Fix lint warnings in InputMethodSubtypeSwitchingController" into sc-dev (c63cb366) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/inputmethod/InputMethodSubtypeSwitchingController.java

+33 −32

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ final class InputMethodSubtypeSwitchingController {
		public final boolean mIsSystemLocale;
		public final boolean mIsSystemLanguage;

		public ImeSubtypeListItem(CharSequence imeName, CharSequence subtypeName,
		ImeSubtypeListItem(CharSequence imeName, CharSequence subtypeName,
		InputMethodInfo imi, int subtypeId, String subtypeLocale, String systemLocale) {
		mImeName = imeName;
		mSubtypeName = subtypeName;
		@@ -71,8 +71,8 @@ final class InputMethodSubtypeSwitchingController {
		// TODO: Use Locale#getLanguage or Locale#toLanguageTag
		final String systemLanguage = parseLanguageFromLocaleString(systemLocale);
		final String subtypeLanguage = parseLanguageFromLocaleString(subtypeLocale);
		mIsSystemLanguage = systemLanguage.length() >= 2 &&
		systemLanguage.equals(subtypeLanguage);
		mIsSystemLanguage = systemLanguage.length() >= 2
		&& systemLanguage.equals(subtypeLanguage);
		}
		}
		}
		@@ -172,7 +172,7 @@ final class InputMethodSubtypeSwitchingController {
		private final String mSystemLocaleStr;
		private final InputMethodSettings mSettings;

		public InputMethodAndSubtypeList(Context context, InputMethodSettings settings) {
		InputMethodAndSubtypeList(Context context, InputMethodSettings settings) {
		mContext = context;
		mSettings = settings;
		mPm = context.getPackageManager();
		@@ -244,7 +244,7 @@ final class InputMethodSubtypeSwitchingController {

		private static class StaticRotationList {
		private final List<ImeSubtypeListItem> mImeSubtypeList;
		public StaticRotationList(final List<ImeSubtypeListItem> imeSubtypeList) {
		StaticRotationList(final List<ImeSubtypeListItem> imeSubtypeList) {
		mImeSubtypeList = imeSubtypeList;
		}

		@@ -257,8 +257,8 @@ final class InputMethodSubtypeSwitchingController {
		*/
		private int getIndex(InputMethodInfo imi, InputMethodSubtype subtype) {
		final int currentSubtypeId = calculateSubtypeId(imi, subtype);
		final int N = mImeSubtypeList.size();
		for (int i = 0; i < N; ++i) {
		final int numSubtypes = mImeSubtypeList.size();
		for (int i = 0; i < numSubtypes; ++i) {
		final ImeSubtypeListItem isli = mImeSubtypeList.get(i);
		// Skip until the current IME/subtype is found.
		if (imi.equals(isli.mImi) && isli.mSubtypeId == currentSubtypeId) {
		@@ -280,10 +280,10 @@ final class InputMethodSubtypeSwitchingController {
		if (currentIndex < 0) {
		return null;
		}
		final int N = mImeSubtypeList.size();
		for (int offset = 1; offset < N; ++offset) {
		final int numSubtypes = mImeSubtypeList.size();
		for (int offset = 1; offset < numSubtypes; ++offset) {
		// Start searching the next IME/subtype from the next of the current index.
		final int candidateIndex = (currentIndex + offset) % N;
		final int candidateIndex = (currentIndex + offset) % numSubtypes;
		final ImeSubtypeListItem candidate = mImeSubtypeList.get(candidateIndex);
		// Skip if searching inside the current IME only, but the candidate is not
		// the current IME.
		@@ -296,8 +296,8 @@ final class InputMethodSubtypeSwitchingController {
		}

		protected void dump(final Printer pw, final String prefix) {
		final int N = mImeSubtypeList.size();
		for (int i = 0; i < N; ++i) {
		final int numSubtypes = mImeSubtypeList.size();
		for (int i = 0; i < numSubtypes; ++i) {
		final int rank = i;
		final ImeSubtypeListItem item = mImeSubtypeList.get(i);
		pw.println(prefix + "rank=" + rank + " item=" + item);
		@@ -313,8 +313,8 @@ final class InputMethodSubtypeSwitchingController {
		private DynamicRotationList(final List<ImeSubtypeListItem> imeSubtypeListItems) {
		mImeSubtypeList = imeSubtypeListItems;
		mUsageHistoryOfSubtypeListItemIndex = new int[mImeSubtypeList.size()];
		final int N = mImeSubtypeList.size();
		for (int i = 0; i < N; i++) {
		final int numSubtypes = mImeSubtypeList.size();
		for (int i = 0; i < numSubtypes; i++) {
		mUsageHistoryOfSubtypeListItemIndex[i] = i;
		}
		}
		@@ -328,13 +328,13 @@ final class InputMethodSubtypeSwitchingController {
		*/
		private int getUsageRank(final InputMethodInfo imi, InputMethodSubtype subtype) {
		final int currentSubtypeId = calculateSubtypeId(imi, subtype);
		final int N = mUsageHistoryOfSubtypeListItemIndex.length;
		for (int usageRank = 0; usageRank < N; usageRank++) {
		final int numItems = mUsageHistoryOfSubtypeListItemIndex.length;
		for (int usageRank = 0; usageRank < numItems; usageRank++) {
		final int subtypeListItemIndex = mUsageHistoryOfSubtypeListItemIndex[usageRank];
		final ImeSubtypeListItem subtypeListItem =
		mImeSubtypeList.get(subtypeListItemIndex);
		if (subtypeListItem.mImi.equals(imi) &&
		subtypeListItem.mSubtypeId == currentSubtypeId) {
		if (subtypeListItem.mImi.equals(imi)
		&& subtypeListItem.mSubtypeId == currentSubtypeId) {
		return usageRank;
		}
		}
		@@ -363,9 +363,9 @@ final class InputMethodSubtypeSwitchingController {
		}
		return null;
		}
		final int N = mUsageHistoryOfSubtypeListItemIndex.length;
		for (int i = 1; i < N; i++) {
		final int subtypeListItemRank = (currentUsageRank + i) % N;
		final int numItems = mUsageHistoryOfSubtypeListItemIndex.length;
		for (int i = 1; i < numItems; i++) {
		final int subtypeListItemRank = (currentUsageRank + i) % numItems;
		final int subtypeListItemIndex =
		mUsageHistoryOfSubtypeListItemIndex[subtypeListItemRank];
		final ImeSubtypeListItem subtypeListItem =
		@@ -399,9 +399,10 @@ final class InputMethodSubtypeSwitchingController {
		final List<ImeSubtypeListItem> switchingAwareImeSubtypes =
		filterImeSubtypeList(sortedEnabledItems,
		true /* supportsSwitchingToNextInputMethod */);
		if (currentInstance != null &&
		currentInstance.mSwitchingAwareRotationList != null &&
		Objects.equals(currentInstance.mSwitchingAwareRotationList.mImeSubtypeList,
		if (currentInstance != null
		&& currentInstance.mSwitchingAwareRotationList != null
		&& Objects.equals(
		currentInstance.mSwitchingAwareRotationList.mImeSubtypeList,
		switchingAwareImeSubtypes)) {
		// Can reuse the current instance.
		switchingAwareRotationList = currentInstance.mSwitchingAwareRotationList;
		@@ -415,9 +416,9 @@ final class InputMethodSubtypeSwitchingController {
		{
		final List<ImeSubtypeListItem> switchingUnawareImeSubtypes = filterImeSubtypeList(
		sortedEnabledItems, false /* supportsSwitchingToNextInputMethod */);
		if (currentInstance != null &&
		currentInstance.mSwitchingUnawareRotationList != null &&
		Objects.equals(
		if (currentInstance != null
		&& currentInstance.mSwitchingUnawareRotationList != null
		&& Objects.equals(
		currentInstance.mSwitchingUnawareRotationList.mImeSubtypeList,
		switchingUnawareImeSubtypes)) {
		// Can reuse the current instance.
		@@ -465,11 +466,11 @@ final class InputMethodSubtypeSwitchingController {
		final List<ImeSubtypeListItem> items,
		final boolean supportsSwitchingToNextInputMethod) {
		final ArrayList<ImeSubtypeListItem> result = new ArrayList<>();
		final int ALL_ITEMS_COUNT = items.size();
		for (int i = 0; i < ALL_ITEMS_COUNT; i++) {
		final int numItems = items.size();
		for (int i = 0; i < numItems; i++) {
		final ImeSubtypeListItem item = items.get(i);
		if (item.mImi.supportsSwitchingToNextInputMethod() ==
		supportsSwitchingToNextInputMethod) {
		if (item.mImi.supportsSwitchingToNextInputMethod()
		== supportsSwitchingToNextInputMethod) {
		result.add(item);
		}
		}