Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev (d280bfea) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@ package android {
		public static final class R.attr {
		ctor public R.attr();
		field public static final int __removed1 = 16844099; // 0x1010543
		field public static final int __removed2 = 16844104; // 0x1010548
		field public static final int absListViewStyle = 16842858; // 0x101006a
		field public static final int accessibilityEventTypes = 16843648; // 0x1010380
		field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
		@@ -1270,7 +1271,6 @@ package android {
		field public static final int summaryOff = 16843248; // 0x10101f0
		field public static final int summaryOn = 16843247; // 0x10101ef
		field public static final int supportsAssist = 16844016; // 0x10104f0
		field public static final int supportsDismissingWindow = 16844104; // 0x1010548
		field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1
		field public static final int supportsLocalInteraction = 16844047; // 0x101050f
		field public static final int supportsPictureInPicture = 16844023; // 0x10104f7

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -326,6 +326,7 @@ package android {
		public static final class R.attr {
		ctor public R.attr();
		field public static final int __removed1 = 16844099; // 0x1010543
		field public static final int __removed2 = 16844104; // 0x1010548
		field public static final int absListViewStyle = 16842858; // 0x101006a
		field public static final int accessibilityEventTypes = 16843648; // 0x1010380
		field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
		@@ -1390,7 +1391,6 @@ package android {
		field public static final int summaryOff = 16843248; // 0x10101f0
		field public static final int summaryOn = 16843247; // 0x10101ef
		field public static final int supportsAssist = 16844016; // 0x10104f0
		field public static final int supportsDismissingWindow = 16844104; // 0x1010548
		field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1
		field public static final int supportsLocalInteraction = 16844047; // 0x101050f
		field public static final int supportsPictureInPicture = 16844023; // 0x10104f7

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@ package android {
		public static final class R.attr {
		ctor public R.attr();
		field public static final int __removed1 = 16844099; // 0x1010543
		field public static final int __removed2 = 16844104; // 0x1010548
		field public static final int absListViewStyle = 16842858; // 0x101006a
		field public static final int accessibilityEventTypes = 16843648; // 0x1010380
		field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
		@@ -1270,7 +1271,6 @@ package android {
		field public static final int summaryOff = 16843248; // 0x10101f0
		field public static final int summaryOn = 16843247; // 0x10101ef
		field public static final int supportsAssist = 16844016; // 0x10104f0
		field public static final int supportsDismissingWindow = 16844104; // 0x1010548
		field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1
		field public static final int supportsLocalInteraction = 16844047; // 0x101050f
		field public static final int supportsPictureInPicture = 16844023; // 0x10104f7

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

+4 −28

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import java.util.List;
		* @attr ref android.R.styleable#InputMethod_settingsActivity
		* @attr ref android.R.styleable#InputMethod_isDefault
		* @attr ref android.R.styleable#InputMethod_supportsSwitchingToNextInputMethod
		* @attr ref android.R.styleable#InputMethod_supportsDismissingWindow
		*/
		public final class InputMethodInfo implements Parcelable {
		static final String TAG = "InputMethodInfo";
		@@ -104,11 +103,6 @@ public final class InputMethodInfo implements Parcelable {
		*/
		private final boolean mSupportsSwitchingToNextInputMethod;

		/**
		* The flag whether this IME supports ways to dismiss its window (e.g. dismiss button.)
		*/
		private final boolean mSupportsDismissingWindow;

		/**
		* @param service the {@link ResolveInfo} corresponds in which the IME is implemented.
		* @return a unique ID to be returned by {@link #getId()}. We have used
		@@ -151,7 +145,6 @@ public final class InputMethodInfo implements Parcelable {
		mId = computeId(service);
		boolean isAuxIme = true;
		boolean supportsSwitchingToNextInputMethod = false; // false as default
		boolean supportsDismissingWindow = false; // false as default
		mForceDefault = false;

		PackageManager pm = context.getPackageManager();
		@@ -191,8 +184,6 @@ public final class InputMethodInfo implements Parcelable {
		supportsSwitchingToNextInputMethod = sa.getBoolean(
		com.android.internal.R.styleable.InputMethod_supportsSwitchingToNextInputMethod,
		false);
		supportsDismissingWindow = sa.getBoolean(
		com.android.internal.R.styleable.InputMethod_supportsDismissingWindow, false);
		sa.recycle();

		final int depth = parser.getDepth();
		@@ -263,7 +254,6 @@ public final class InputMethodInfo implements Parcelable {
		mIsDefaultResId = isDefaultResId;
		mIsAuxIme = isAuxIme;
		mSupportsSwitchingToNextInputMethod = supportsSwitchingToNextInputMethod;
		mSupportsDismissingWindow = supportsDismissingWindow;
		}

		InputMethodInfo(Parcel source) {
		@@ -272,7 +262,6 @@ public final class InputMethodInfo implements Parcelable {
		mIsDefaultResId = source.readInt();
		mIsAuxIme = source.readInt() == 1;
		mSupportsSwitchingToNextInputMethod = source.readInt() == 1;
		mSupportsDismissingWindow = source.readInt() == 1;
		mService = ResolveInfo.CREATOR.createFromParcel(source);
		mSubtypes = new InputMethodSubtypeArray(source);
		mForceDefault = false;
		@@ -285,8 +274,7 @@ public final class InputMethodInfo implements Parcelable {
		CharSequence label, String settingsActivity) {
		this(buildDummyResolveInfo(packageName, className, label), false /* isAuxIme */,
		settingsActivity, null /* subtypes /, 0 / isDefaultResId */,
		false /* forceDefault /, true / supportsSwitchingToNextInputMethod */,
		true /* supportsDismissingWindow */);
		false /* forceDefault /, true / supportsSwitchingToNextInputMethod */);
		}

		/**
		@@ -297,8 +285,7 @@ public final class InputMethodInfo implements Parcelable {
		String settingsActivity, List<InputMethodSubtype> subtypes, int isDefaultResId,
		boolean forceDefault) {
		this(ri, isAuxIme, settingsActivity, subtypes, isDefaultResId, forceDefault,
		true /* supportsSwitchingToNextInputMethod */,
		true /* supportsDismissingWindow */);
		true /* supportsSwitchingToNextInputMethod */);
		}

		/**
		@@ -307,7 +294,7 @@ public final class InputMethodInfo implements Parcelable {
		*/
		public InputMethodInfo(ResolveInfo ri, boolean isAuxIme, String settingsActivity,
		List<InputMethodSubtype> subtypes, int isDefaultResId, boolean forceDefault,
		boolean supportsSwitchingToNextInputMethod, boolean supportsDismissingWindow) {
		boolean supportsSwitchingToNextInputMethod) {
		final ServiceInfo si = ri.serviceInfo;
		mService = ri;
		mId = new ComponentName(si.packageName, si.name).flattenToShortString();
		@@ -317,7 +304,6 @@ public final class InputMethodInfo implements Parcelable {
		mSubtypes = new InputMethodSubtypeArray(subtypes);
		mForceDefault = forceDefault;
		mSupportsSwitchingToNextInputMethod = supportsSwitchingToNextInputMethod;
		mSupportsDismissingWindow = supportsDismissingWindow;
		}

		private static ResolveInfo buildDummyResolveInfo(String packageName, String className,
		@@ -458,8 +444,7 @@ public final class InputMethodInfo implements Parcelable {
		public void dump(Printer pw, String prefix) {
		pw.println(prefix + "mId=" + mId
		+ " mSettingsActivityName=" + mSettingsActivityName
		+ " mSupportsSwitchingToNextInputMethod=" + mSupportsSwitchingToNextInputMethod
		+ " mSupportsDismissingWindow=" + mSupportsDismissingWindow);
		+ " mSupportsSwitchingToNextInputMethod=" + mSupportsSwitchingToNextInputMethod);
		pw.println(prefix + "mIsDefaultResId=0x"
		+ Integer.toHexString(mIsDefaultResId));
		pw.println(prefix + "Service:");
		@@ -511,14 +496,6 @@ public final class InputMethodInfo implements Parcelable {
		return mSupportsSwitchingToNextInputMethod;
		}

		/**
		* @return true if this input method supports ways to dismiss its window.
		* @hide
		*/
		public boolean supportsDismissingWindow() {
		return mSupportsDismissingWindow;
		}

		/**
		* Used to package this object into a {@link Parcel}.
		*
		@@ -532,7 +509,6 @@ public final class InputMethodInfo implements Parcelable {
		dest.writeInt(mIsDefaultResId);
		dest.writeInt(mIsAuxIme ? 1 : 0);
		dest.writeInt(mSupportsSwitchingToNextInputMethod ? 1 : 0);
		dest.writeInt(mSupportsDismissingWindow ? 1 : 0);
		mService.writeToParcel(dest, flags);
		mSubtypes.writeToParcel(dest);
		}

core/res/res/values/attrs.xml

+1 −12

Original line number	Diff line number	Diff line
		@@ -3217,18 +3217,7 @@
		and subtype in order to provide the consistent user experience in switching
		between IMEs and subtypes. -->
		<attr name="supportsSwitchingToNextInputMethod" format="boolean" />
		<!-- Set to true if this input method supports ways to dismiss the windows assigned to
		the input method (for example, a dismiss button rendered by the input method itself). The
		System UI may optimize the UI by not showing system-level dismiss button if this
		value is true.
		<p> Must be a boolean value, either "true" or "false". The default value is "false".
		<p> This may also be a reference to a resource (in the form "@[package:]type:name")
		or theme attribute (in the form "?[package:]type:name") containing a value of this
		type.
		<p> A UI element that dismisses the input method window should report
		{@link android.view.accessibility.AccessibilityNodeInfo#ACTION_DISMISS} action, so
		that accessibility services can handle it accordingly. -->
		<attr name="supportsDismissingWindow" format="boolean" />
		<attr name="__removed2" format="boolean" />
		</declare-styleable>

		<!-- This is the subtype of InputMethod. Subtype can describe locales (for example, en_US and