Merge "Move EditableInputConnection into com.android.internal.inputmethod" (bb7b47e1) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -126,13 +126,13 @@ import android.widget.TextView.Drawables;
		import android.widget.TextView.OnEditorActionListener;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.inputmethod.EditableInputConnection;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.GrowingArrayUtils;
		import com.android.internal.util.Preconditions;
		import com.android.internal.view.FloatingActionMode;
		import com.android.internal.widget.EditableInputConnection;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

core/java/android/widget/TextView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -202,12 +202,12 @@ import android.widget.RemoteViews.RemoteView;

		import com.android.internal.accessibility.util.AccessibilityUtils;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.inputmethod.EditableInputConnection;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.FastMath;
		import com.android.internal.util.Preconditions;
		import com.android.internal.widget.EditableInputConnection;

		import libcore.util.EmptyArray;

core/java/com/android/internal/widget/EditableInputConnection.java→core/java/com/android/internal/inputmethod/EditableInputConnection.java

+26 −27

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007-2008 The Android Open Source Project
		* Copyright (C) 2007 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
		* 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.
		* 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.
		*/

		package com.android.internal.widget;
		package com.android.internal.inputmethod;

		import static android.view.inputmethod.InputConnectionProto.CURSOR_CAPS_MODE;
		import static android.view.inputmethod.InputConnectionProto.EDITABLE_TEXT;
		@@ -40,9 +40,9 @@ import android.widget.TextView;

		/**
		* Base class for an editable InputConnection instance. This is created by {@link TextView} or
		* {@link EditText}.
		* {@link android.widget.EditText}.
		*/
		public class EditableInputConnection extends BaseInputConnection
		public final class EditableInputConnection extends BaseInputConnection
		implements DumpableInputConnection {
		private static final boolean DEBUG = false;
		private static final String TAG = "EditableInputConnection";
		@@ -211,14 +211,13 @@ public class EditableInputConnection extends BaseInputConnection

		// It is possible that any other bit is used as a valid flag in a future release.
		// We should reject the entire request in such a case.
		final int KNOWN_FLAGS_MASK = InputConnection.CURSOR_UPDATE_IMMEDIATE \|
		InputConnection.CURSOR_UPDATE_MONITOR;
		final int unknownFlags = cursorUpdateMode & ~KNOWN_FLAGS_MASK;
		final int knownFlagMask = InputConnection.CURSOR_UPDATE_IMMEDIATE
		\| InputConnection.CURSOR_UPDATE_MONITOR;
		final int unknownFlags = cursorUpdateMode & ~knownFlagMask;
		if (unknownFlags != 0) {
		if (DEBUG) {
		Log.d(TAG, "Rejecting requestUpdateCursorAnchorInfo due to unknown flags." +
		" cursorUpdateMode=" + cursorUpdateMode +
		" unknownFlags=" + unknownFlags);
		Log.d(TAG, "Rejecting requestUpdateCursorAnchorInfo due to unknown flags. "
		+ "cursorUpdateMode=" + cursorUpdateMode + " unknownFlags=" + unknownFlags);
		}
		return false;
		}