summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2014-03-19 20:11:12 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-19 20:11:12 +0000
commit96abebd02559137fa320a17c5b7a985d6fc068ba (patch)
treedfcbfee21d5a3a174aff8929e56f5bef9560f591
parent42b746e4d8baa6141598ddaae7148baea2ddf366 (diff)
parent80af53162477385f20956a55305d0c048ef5c1df (diff)
am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev
* commit '80af53162477385f20956a55305d0c048ef5c1df': Fix inverted conditional in View.setFilterTouchesWhenObscured.
-rw-r--r--core/java/android/view/View.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 9b47cbe24b81..6b73ae7bbab4 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);
}