diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-03-19 20:05:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 20:05:40 +0000 |
| commit | 80af53162477385f20956a55305d0c048ef5c1df (patch) | |
| tree | 47b54f504b4a3733682182467c81a4cde39c91e0 /core/java/android/view/View.java | |
| parent | bd84f01c6ce122ab58fc7c5b687dc8bfb0fb03e6 (diff) | |
| parent | f260ed09263d60ff941225e31e22d344afd90c0f (diff) | |
| download | frameworks_base-80af53162477385f20956a55305d0c048ef5c1df.zip frameworks_base-80af53162477385f20956a55305d0c048ef5c1df.tar.gz frameworks_base-80af53162477385f20956a55305d0c048ef5c1df.tar.bz2 | |
am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
* commit 'f260ed09263d60ff941225e31e22d344afd90c0f':
Fix inverted conditional in View.setFilterTouchesWhenObscured.
Diffstat (limited to 'core/java/android/view/View.java')
| -rw-r--r-- | core/java/android/view/View.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index b0bae46..5015b7e 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -6543,7 +6543,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @attr ref android.R.styleable#View_filterTouchesWhenObscured */ public void setFilterTouchesWhenObscured(boolean enabled) { - setFlags(enabled ? 0 : FILTER_TOUCHES_WHEN_OBSCURED, + setFlags(enabled ? FILTER_TOUCHES_WHEN_OBSCURED : 0, FILTER_TOUCHES_WHEN_OBSCURED); } |