diff options
7 files changed, 0 insertions, 201 deletions
diff --git a/api/removed.txt b/api/removed.txt index 527f6c2..8972679 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -35,41 +35,6 @@ package android.view { } -package android.view.inputmethod { - - public class BaseInputConnection implements android.view.inputmethod.InputConnection { - method public final boolean requestUpdateCursorAnchorInfo(int); - } - - public final class CursorAnchorInfo implements android.os.Parcelable { - method public android.graphics.RectF getCharacterRect(int); - method public int getCharacterRectFlags(int); - method public boolean isInsertionMarkerClipped(); - field public static final int CHARACTER_RECT_TYPE_FULLY_VISIBLE = 1; // 0x1 - field public static final int CHARACTER_RECT_TYPE_INVISIBLE = 3; // 0x3 - field public static final int CHARACTER_RECT_TYPE_MASK = 15; // 0xf - field public static final int CHARACTER_RECT_TYPE_NOT_FEASIBLE = 4; // 0x4 - field public static final int CHARACTER_RECT_TYPE_PARTIALLY_VISIBLE = 2; // 0x2 - field public static final int CHARACTER_RECT_TYPE_UNSPECIFIED = 0; // 0x0 - } - - public static final class CursorAnchorInfo.Builder { - method public android.view.inputmethod.CursorAnchorInfo.Builder addCharacterRect(int, float, float, float, float, int); - method public android.view.inputmethod.CursorAnchorInfo.Builder setInsertionMarkerLocation(float, float, float, float, boolean); - } - - public abstract interface InputConnection { - method public abstract boolean requestUpdateCursorAnchorInfo(int); - field public static final int REQUEST_UPDATE_CURSOR_ANCHOR_INFO_MONITOR = 2; // 0x2 - field public static final int REQUEST_UPDATE_CURSOR_UPDATE_IMMEDIATE = 1; // 0x1 - } - - public class InputConnectionWrapper implements android.view.inputmethod.InputConnection { - method public final boolean requestUpdateCursorAnchorInfo(int); - } - -} - package android.widget { public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener { diff --git a/core/java/android/view/inputmethod/BaseInputConnection.java b/core/java/android/view/inputmethod/BaseInputConnection.java index 20adfe4..ba5d6c2 100644 --- a/core/java/android/view/inputmethod/BaseInputConnection.java +++ b/core/java/android/view/inputmethod/BaseInputConnection.java @@ -436,14 +436,6 @@ public class BaseInputConnection implements InputConnection { } /** - * The default implementation does nothing. - * @removed - */ - public final boolean requestUpdateCursorAnchorInfo(int cursorUpdateMode) { - return false; - } - - /** * The default implementation places the given text into the editable, * replacing any existing composing text. The new text is marked as * in a composing state with the composing style. diff --git a/core/java/android/view/inputmethod/CursorAnchorInfo.java b/core/java/android/view/inputmethod/CursorAnchorInfo.java index 600fffe..fd73432 100644 --- a/core/java/android/view/inputmethod/CursorAnchorInfo.java +++ b/core/java/android/view/inputmethod/CursorAnchorInfo.java @@ -120,38 +120,6 @@ public final class CursorAnchorInfo implements Parcelable { */ public static final int FLAG_IS_RTL = 0x04; - /** - * @removed - */ - public static final int CHARACTER_RECT_TYPE_MASK = 0x0f; - /** - * Type for {@link #CHARACTER_RECT_TYPE_MASK}: the editor did not specify any type of this - * character. Editor authors should not use this flag. - * @removed - */ - public static final int CHARACTER_RECT_TYPE_UNSPECIFIED = 0; - /** - * Type for {@link #CHARACTER_RECT_TYPE_MASK}: the character is entirely visible. - * @removed - */ - public static final int CHARACTER_RECT_TYPE_FULLY_VISIBLE = 1; - /** - * Type for {@link #CHARACTER_RECT_TYPE_MASK}: some area of the character is invisible. - * @removed - */ - public static final int CHARACTER_RECT_TYPE_PARTIALLY_VISIBLE = 2; - /** - * Type for {@link #CHARACTER_RECT_TYPE_MASK}: the character is entirely invisible. - * @removed - */ - public static final int CHARACTER_RECT_TYPE_INVISIBLE = 3; - /** - * Type for {@link #CHARACTER_RECT_TYPE_MASK}: the editor gave up to calculate the rectangle - * for this character. Input method authors should ignore the returned rectangle. - * @removed - */ - public static final int CHARACTER_RECT_TYPE_NOT_FEASIBLE = 4; - public CursorAnchorInfo(final Parcel source) { mSelectionStart = source.readInt(); mSelectionEnd = source.readInt(); @@ -318,20 +286,6 @@ public final class CursorAnchorInfo implements Parcelable { } /** - * @removed - */ - public Builder setInsertionMarkerLocation(final float horizontalPosition, - final float lineTop, final float lineBaseline, final float lineBottom, - final boolean clipped){ - mInsertionMarkerHorizontal = horizontalPosition; - mInsertionMarkerTop = lineTop; - mInsertionMarkerBaseline = lineBaseline; - mInsertionMarkerBottom = lineBottom; - mInsertionMarkerFlags = clipped ? FLAG_HAS_INVISIBLE_REGION : 0; - return this; - } - - /** * Sets the location of the text insertion point (zero width cursor) as a rectangle in * local coordinates. Calling this can be skipped when there is no text insertion point; * however if there is an insertion point, editors must call this method. @@ -390,43 +344,6 @@ public final class CursorAnchorInfo implements Parcelable { } /** - * Adds the bounding box of the character specified with the index. - * - * @param index index of the character in Java chars units. Must be specified in - * ascending order across successive calls. - * @param leadingEdgeX x coordinate of the leading edge of the character in local - * coordinates, that is, left edge for LTR text and right edge for RTL text. - * @param leadingEdgeY y coordinate of the leading edge of the character in local - * coordinates. - * @param trailingEdgeX x coordinate of the trailing edge of the character in local - * coordinates, that is, right edge for LTR text and left edge for RTL text. - * @param trailingEdgeY y coordinate of the trailing edge of the character in local - * coordinates. - * @param flags flags for this character rect. See {@link #FLAG_HAS_VISIBLE_REGION} for - * example. - * @throws IllegalArgumentException If the index is a negative value, or not greater than - * all of the previously called indices. - * @removed - */ - public Builder addCharacterRect(final int index, final float leadingEdgeX, - final float leadingEdgeY, final float trailingEdgeX, final float trailingEdgeY, - final int flags) { - final int newFlags; - final float left; - final float right; - if (leadingEdgeX <= trailingEdgeX) { - newFlags = flags; - left = leadingEdgeX; - right = trailingEdgeX; - } else { - newFlags = flags | FLAG_IS_RTL; - left = trailingEdgeX; - right = leadingEdgeX; - } - return addCharacterBounds(index, left, leadingEdgeY, right, trailingEdgeY, newFlags); - } - - /** * Sets the matrix that transforms local coordinates into screen coordinates. * @param matrix transformation matrix from local coordinates into screen coordinates. null * is interpreted as an identity matrix. @@ -538,15 +455,6 @@ public final class CursorAnchorInfo implements Parcelable { } /** - * Returns the visibility of the insertion marker. - * @return {@code true} if the insertion marker is partially or entirely clipped. - * @removed - */ - public boolean isInsertionMarkerClipped() { - return (mInsertionMarkerFlags & FLAG_HAS_VISIBLE_REGION) != 0; - } - - /** * Returns the horizontal start of the insertion marker, in the local coordinates that will * be transformed with {@link #getMatrix()} when rendered on the screen. * @return x coordinate that is compatible with {@link Layout#getPrimaryHorizontal(int)}. @@ -602,25 +510,6 @@ public final class CursorAnchorInfo implements Parcelable { } /** - * Returns a new instance of {@link RectF} that indicates the location of the character - * specified with the index. - * <p> - * Note that coordinates are not necessarily contiguous or even monotonous, especially when - * RTL text and LTR text are mixed. - * </p> - * @param index index of the character in a Java chars. - * @return a new instance of {@link RectF} that represents the location of the character in - * local coordinates. null if the character is invisible or the application did not provide - * the location. Note that the {@code left} field can be greater than the {@code right} field - * if the character is in RTL text. Returns {@code null} if no location information is - * available. - * @removed - */ - public RectF getCharacterRect(final int index) { - return getCharacterBounds(index); - } - - /** * Returns the flags associated with the character bounds specified with the index. * @param index index of the character in a Java chars. * @return {@code 0} if no flag is specified. @@ -633,16 +522,6 @@ public final class CursorAnchorInfo implements Parcelable { } /** - * Returns the flags associated with the character rect specified with the index. - * @param index index of the character in a Java chars. - * @return {@code 0} if no flag is specified. - * @removed - */ - public int getCharacterRectFlags(final int index) { - return getCharacterBoundsFlags(index); - } - - /** * Returns a new instance of {@link android.graphics.Matrix} that indicates the transformation * matrix that is to be applied other positional data in this class. * @return a new instance (copy) of the transformation matrix. diff --git a/core/java/android/view/inputmethod/InputConnection.java b/core/java/android/view/inputmethod/InputConnection.java index 093fb2f..c51d8a7 100644 --- a/core/java/android/view/inputmethod/InputConnection.java +++ b/core/java/android/view/inputmethod/InputConnection.java @@ -756,19 +756,4 @@ public interface InputConnection { * {@link InputMethodManager#updateCursorAnchorInfo(android.view.View, CursorAnchorInfo)}. */ public boolean requestCursorUpdates(int cursorUpdateMode); - - /** - * @removed - */ - public static final int REQUEST_UPDATE_CURSOR_UPDATE_IMMEDIATE = 1 << 0; - - /** - * @removed - */ - public static final int REQUEST_UPDATE_CURSOR_ANCHOR_INFO_MONITOR = 1 << 1; - - /** - * @removed - */ - public boolean requestUpdateCursorAnchorInfo(int cursorUpdateMode); } diff --git a/core/java/android/view/inputmethod/InputConnectionWrapper.java b/core/java/android/view/inputmethod/InputConnectionWrapper.java index 87853de..231aa07 100644 --- a/core/java/android/view/inputmethod/InputConnectionWrapper.java +++ b/core/java/android/view/inputmethod/InputConnectionWrapper.java @@ -129,11 +129,4 @@ public class InputConnectionWrapper implements InputConnection { public boolean requestCursorUpdates(int cursorUpdateMode) { return mTarget.requestCursorUpdates(cursorUpdateMode); } - - /** - * @removed - */ - public final boolean requestUpdateCursorAnchorInfo(int cursorUpdateMode) { - return mTarget.requestCursorUpdates(cursorUpdateMode); - } } diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 94d52d5..3859e48 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -5721,14 +5721,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te public boolean requestCursorUpdates(int cursorUpdateMode) { return getTarget().requestCursorUpdates(cursorUpdateMode); } - - /** - * @removed - */ - @Override - public boolean requestUpdateCursorAnchorInfo(int cursorUpdateMode) { - return getTarget().requestCursorUpdates(cursorUpdateMode); - } } /** diff --git a/core/java/com/android/internal/view/InputConnectionWrapper.java b/core/java/com/android/internal/view/InputConnectionWrapper.java index 0c65ad1..7dc927f 100644 --- a/core/java/com/android/internal/view/InputConnectionWrapper.java +++ b/core/java/com/android/internal/view/InputConnectionWrapper.java @@ -445,11 +445,4 @@ public class InputConnectionWrapper implements InputConnection { } return result; } - - /** - * @removed - */ - public boolean requestUpdateCursorAnchorInfo(int cursorUpdateMode) { - return requestCursorUpdates(cursorUpdateMode); - } } |