Merge "Remove BuildCompatUtils.VERSION_CODES_LXX" (baecaa54) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -33,11 +33,4 @@ public final class BuildCompatUtils {
		public static final int EFFECTIVE_SDK_INT = IS_RELEASE_BUILD
		? Build.VERSION.SDK_INT
		: Build.VERSION.SDK_INT + 1;

		/**
		* API version for L-release.
		*/
		// TODO: Substitute this constant reference with Build.VERSION_CODES.L* once the next version
		// becomes available.
		public static final int VERSION_CODES_LXX = 21;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -50,10 +50,10 @@ public class CursorAnchorInfoCompatWrapper {
		// This class is not publicly instantiable.
		}

		@TargetApi(BuildCompatUtils.VERSION_CODES_LXX)
		@TargetApi(Build.VERSION_CODES.LOLLIPOP)
		@Nullable
		public static CursorAnchorInfoCompatWrapper wrap(@Nullable final CursorAnchorInfo instance) {
		if (Build.VERSION.SDK_INT < BuildCompatUtils.VERSION_CODES_LXX) {
		if (BuildCompatUtils.EFFECTIVE_SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
		return null;
		}
		if (instance == null) {
		@@ -110,7 +110,7 @@ public class CursorAnchorInfoCompatWrapper {
		throw new UnsupportedOperationException("not supported.");
		}

		@TargetApi(BuildCompatUtils.VERSION_CODES_LXX)
		@TargetApi(Build.VERSION_CODES.LOLLIPOP)
		private static final class RealWrapper extends CursorAnchorInfoCompatWrapper {

		@Nonnull

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.inputmethod.compat;

		import android.inputmethodservice.InputMethodService;
		import android.os.Build;
		import android.view.View;

		public class ViewOutlineProviderCompatUtils {
		@@ -34,7 +35,7 @@ public class ViewOutlineProviderCompatUtils {
		};

		public static InsetsUpdater setInsetsOutlineProvider(final View view) {
		if (BuildCompatUtils.EFFECTIVE_SDK_INT < BuildCompatUtils.VERSION_CODES_LXX) {
		if (BuildCompatUtils.EFFECTIVE_SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
		return EMPTY_INSETS_UPDATER;
		}
		return ViewOutlineProviderCompatUtilsLXX.setInsetsOutlineProvider(view);

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.inputmethod.keyboard;

		import android.content.Context;
		import android.content.SharedPreferences;
		import android.os.Build;
		import android.os.Build.VERSION_CODES;
		import android.preference.PreferenceManager;
		import android.util.Log;
		@@ -54,7 +55,7 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
		VERSION_CODES.ICE_CREAM_SANDWICH),
		new KeyboardTheme(THEME_ID_LXX_LIGHT, "LXXLight", R.style.KeyboardTheme_LXX_Light,
		// Default theme for LXX.
		BuildCompatUtils.VERSION_CODES_LXX),
		Build.VERSION_CODES.LOLLIPOP),
		new KeyboardTheme(THEME_ID_LXX_DARK, "LXXDark", R.style.KeyboardTheme_LXX_Dark,
		// This has never been selected as default theme.
		VERSION_CODES.BASE),

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
		public static final boolean ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS =
		BuildCompatUtils.EFFECTIVE_SDK_INT <= Build.VERSION_CODES.KITKAT;
		public static final boolean SHOULD_SHOW_LXX_SUGGESTION_UI =
		BuildCompatUtils.EFFECTIVE_SDK_INT >= BuildCompatUtils.VERSION_CODES_LXX;
		BuildCompatUtils.EFFECTIVE_SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
		public static final String PREF_SHOW_LANGUAGE_SWITCH_KEY =
		"pref_show_language_switch_key";
		public static final String PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST =