am 7b6b30df: am 9d71a6c9: Remove unused device form factor values (55b98d25) · Commits · e / os / android_packages_inputmethods_LatinIME

java/res/values-sw600dp/config.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@
		-->

		<resources>
		<!-- Device form factor. This value must be aligned with {@link KeyboardId.FORM_FACTOR_TABLET7} -->
		<integer name="config_device_form_factor">1</integer>
		<bool name="config_enable_show_voice_key_option">false</bool>
		<bool name="config_enable_show_option_of_key_preview_popup">false</bool>
		<bool name="config_enable_bigram_suggestions_option">false</bool>

java/res/values-sw768dp/config.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@
		-->

		<resources>
		<!-- Device form factor. This value must be aligned with {@link KeyboardId.FORM_FACTOR_TABLET10} -->
		<integer name="config_device_form_factor">2</integer>
		<bool name="config_enable_show_voice_key_option">false</bool>
		<bool name="config_enable_show_option_of_key_preview_popup">false</bool>
		<bool name="config_enable_bigram_suggestions_option">false</bool>

java/res/values/config.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@
		-->

		<resources>
		<!-- Device form factor. This value must be aligned with {@link KeyboardId.FORM_FACTOR_PHONE} -->
		<integer name="config_device_form_factor">0</integer>
		<bool name="config_use_fullscreen_mode">false</bool>
		<bool name="config_enable_show_voice_key_option">true</bool>
		<bool name="config_enable_show_option_of_key_preview_popup">true</bool>

java/src/com/android/inputmethod/keyboard/KeyboardId.java

+3 −20

Original line number	Diff line number	Diff line
		@@ -56,13 +56,8 @@ public final class KeyboardId {
		public static final int ELEMENT_PHONE_SYMBOLS = 8;
		public static final int ELEMENT_NUMBER = 9;

		public static final int FORM_FACTOR_PHONE = 0;
		public static final int FORM_FACTOR_TABLET7 = 1;
		public static final int FORM_FACTOR_TABLET10 = 2;

		public final InputMethodSubtype mSubtype;
		public final Locale mLocale;
		public final int mDeviceFormFactor;
		// TODO: Remove this member. It is used only for logging purpose.
		public final int mOrientation;
		public final int mWidth;
		@@ -82,7 +77,6 @@ public final class KeyboardId {
		public KeyboardId(final int elementId, final KeyboardLayoutSet.Params params) {
		mSubtype = params.mSubtype;
		mLocale = SubtypeLocale.getSubtypeLocale(mSubtype);
		mDeviceFormFactor = params.mDeviceFormFactor;
		mOrientation = params.mOrientation;
		mWidth = params.mKeyboardWidth;
		mHeight = params.mKeyboardHeight;
		@@ -107,7 +101,6 @@ public final class KeyboardId {

		private static int computeHashCode(final KeyboardId id) {
		return Arrays.hashCode(new Object[] {
		id.mDeviceFormFactor,
		id.mOrientation,
		id.mElementId,
		id.mMode,
		@@ -130,8 +123,7 @@ public final class KeyboardId {
		private boolean equals(final KeyboardId other) {
		if (other == this)
		return true;
		return other.mDeviceFormFactor == mDeviceFormFactor
		&& other.mOrientation == mOrientation
		return other.mOrientation == mOrientation
		&& other.mElementId == mElementId
		&& other.mMode == mMode
		&& other.mWidth == mWidth
		@@ -195,11 +187,11 @@ public final class KeyboardId {
		public String toString() {
		final String orientation = (mOrientation == Configuration.ORIENTATION_PORTRAIT)
		? "port" : "land";
		return String.format("[%s %s:%s %s-%s:%dx%d %s %s %s%s%s%s%s%s%s%s%s]",
		return String.format("[%s %s:%s %s:%dx%d %s %s %s%s%s%s%s%s%s%s%s]",
		elementIdToName(mElementId),
		mLocale,
		mSubtype.getExtraValueOf(KEYBOARD_LAYOUT_SET),
		deviceFormFactor(mDeviceFormFactor), orientation, mWidth, mHeight,
		orientation, mWidth, mHeight,
		modeName(mMode),
		imeAction(),
		(navigateNext() ? "navigateNext" : ""),
		@@ -238,15 +230,6 @@ public final class KeyboardId {
		}
		}

		public static String deviceFormFactor(final int deviceFormFactor) {
		switch (deviceFormFactor) {
		case FORM_FACTOR_PHONE: return "phone";
		case FORM_FACTOR_TABLET7: return "tablet7";
		case FORM_FACTOR_TABLET10: return "tablet10";
		default: return null;
		}
		}

		public static String modeName(final int mode) {
		switch (mode) {
		case MODE_TEXT: return "text";

java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -106,7 +106,6 @@ public final class KeyboardLayoutSet {
		boolean mNoSettingsKey;
		boolean mLanguageSwitchKeyEnabled;
		InputMethodSubtype mSubtype;
		int mDeviceFormFactor;
		int mOrientation;
		int mKeyboardWidth;
		int mKeyboardHeight;
		@@ -217,10 +216,8 @@ public final class KeyboardLayoutSet {
		mPackageName, NO_SETTINGS_KEY, mEditorInfo);
		}

		public Builder setScreenGeometry(final int deviceFormFactor, final int widthPixels,
		final int heightPixels) {
		public Builder setScreenGeometry(final int widthPixels, final int heightPixels) {
		final Params params = mParams;
		params.mDeviceFormFactor = deviceFormFactor;
		params.mOrientation = (heightPixels > widthPixels)
		? Configuration.ORIENTATION_PORTRAIT : Configuration.ORIENTATION_LANDSCAPE;
		setDefaultKeyboardSize(widthPixels, heightPixels);