summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Gilles Debunne <debunne@google.com> 2011-08-17 14:03:56 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-08-17 14:03:56 -0700
commit45add1abe3c6a96aa170f5321bb14fb8e16e9a6b (patch)
tree7c11332ec6bf4ac3f21c802ba591c9841e5230ce
parent841b941202d5272e49e1d2269abac6cdbf7fb381 (diff)
parent15b8016434a888b47a6032715acf831a0e0b2e5c (diff)
Merge "Fix bit comparison for checking the variant of the input type."
-rw-r--r--core/java/android/widget/TextView.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index d6cb61dfa708..688d69bd924c 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -9499,8 +9499,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
public boolean isSuggestionsEnabled() {
if (!mSuggestionsEnabled) return false;
if ((mInputType & InputType.TYPE_MASK_CLASS) != InputType.TYPE_CLASS_TEXT) return false;
- final int variation =
- mInputType & (EditorInfo.TYPE_MASK_CLASS | EditorInfo.TYPE_MASK_VARIATION);
+ final int variation = mInputType & EditorInfo.TYPE_MASK_VARIATION;
if (variation == EditorInfo.TYPE_TEXT_VARIATION_NORMAL ||
variation == EditorInfo.TYPE_TEXT_VARIATION_EMAIL_SUBJECT ||
variation == EditorInfo.TYPE_TEXT_VARIATION_LONG_MESSAGE ||