| Index: content/public/android/java/src/org/chromium/content/browser/input/TextInputState.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/input/TextInputState.java b/content/public/android/java/src/org/chromium/content/browser/input/TextInputState.java
|
| index 38684dfc9d9cfac2a51d79f0e630417255073812..d2054855ddcf654a4ba941a8b30607470545111e 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/input/TextInputState.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/input/TextInputState.java
|
| @@ -17,10 +17,10 @@ public class TextInputState {
|
| private final Range mSelection;
|
| private final Range mComposition;
|
| private final boolean mSingleLine;
|
| - private final boolean mFromIme;
|
| + private final boolean mReplyToRequest;
|
|
|
| public TextInputState(CharSequence text, Range selection, Range composition, boolean singleLine,
|
| - boolean fromIme) {
|
| + boolean replyToRequest) {
|
| selection.clamp(0, text.length());
|
| if (composition.start() != -1 || composition.end() != -1) {
|
| composition.clamp(0, text.length());
|
| @@ -29,7 +29,7 @@ public class TextInputState {
|
| mSelection = selection;
|
| mComposition = composition;
|
| mSingleLine = singleLine;
|
| - mFromIme = fromIme;
|
| + mReplyToRequest = replyToRequest;
|
| }
|
|
|
| public CharSequence text() {
|
| @@ -48,8 +48,8 @@ public class TextInputState {
|
| return mSingleLine;
|
| }
|
|
|
| - public boolean fromIme() {
|
| - return mFromIme;
|
| + public boolean replyToRequest() {
|
| + return mReplyToRequest;
|
| }
|
|
|
| public CharSequence getSelectedText() {
|
| @@ -74,13 +74,13 @@ public class TextInputState {
|
| if (t == this) return true;
|
| return TextUtils.equals(mText, t.mText) && mSelection.equals(t.mSelection)
|
| && mComposition.equals(t.mComposition) && mSingleLine == t.mSingleLine
|
| - && mFromIme == t.mFromIme;
|
| + && mReplyToRequest == t.mReplyToRequest;
|
| }
|
|
|
| @Override
|
| public int hashCode() {
|
| return mText.hashCode() * 7 + mSelection.hashCode() * 11 + mComposition.hashCode() * 13
|
| - + (mSingleLine ? 19 : 0) + (mFromIme ? 23 : 0);
|
| + + (mSingleLine ? 19 : 0) + (mReplyToRequest ? 23 : 0);
|
| }
|
|
|
| @SuppressWarnings("unused")
|
| @@ -90,8 +90,8 @@ public class TextInputState {
|
|
|
| @Override
|
| public String toString() {
|
| - return String.format(Locale.US, "TextInputState {[%s] SEL%s COM%s %s %s}", mText,
|
| - mSelection, mComposition, mSingleLine ? "SIN" : "MUL",
|
| - mFromIme ? "fromIME" : "NOTfromIME");
|
| + return String.format(Locale.US, "TextInputState {[%s] SEL%s COM%s %s%s}", mText, mSelection,
|
| + mComposition, mSingleLine ? "SIN" : "MUL",
|
| + mReplyToRequest ? " ReplyToRequest" : "");
|
| }
|
| }
|
|
|