diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-01-28 01:54:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-28 01:54:48 +0000 |
| commit | b46df69a77ac24bf2b1d296011827d6fdf0ea336 (patch) | |
| tree | c5d33f9acb5b73add90873f9c66bbbece6c70726 /core/java/android/widget | |
| parent | 1df8f1ea95d3b5c4b96743b830320b46d6c1990a (diff) | |
| parent | 2b004b3abaa8b4eb4b51c6e78840ff793d1ea9e8 (diff) | |
Merge "Move autofill focus triggers from TextView to View."
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/TextView.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a5fb572ea6ed..51b5b13c10d3 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -9028,14 +9028,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener Spannable sp = (Spannable) mText; MetaKeyKeyListener.resetMetaState(sp); } - } else { - final AutoFillManager afm = mContext.getSystemService(AutoFillManager.class); - if (afm != null) { - if (DEBUG_AUTOFILL) { - Log.v(LOG_TAG, "onFocusChanged(false): id=" + getAccessibilityViewId()); - } - afm.updateAutoFillInput(this, AutoFillManager.FLAG_UPDATE_UI_HIDE); - } } startStopMarquee(focused); @@ -9767,10 +9759,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } @Override + @Nullable public AutoFillType getAutoFillType() { - // TODO(b/33197203): ideally it should return a constant, but value returned by - // getInputType() can change. - return AutoFillType.forText(getInputType()); + return isTextEditable() ? AutoFillType.forText(getInputType()) : null; } /** @hide */ |