am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev

* commit 'f260ed09263d60ff941225e31e22d344afd90c0f':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.
This commit is contained in:
Jeff Brown
2014-03-19 20:05:40 +00:00
committed by Android Git Automerger

View File

@@ -6543,7 +6543,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @attr ref android.R.styleable#View_filterTouchesWhenObscured * @attr ref android.R.styleable#View_filterTouchesWhenObscured
*/ */
public void setFilterTouchesWhenObscured(boolean enabled) { public void setFilterTouchesWhenObscured(boolean enabled) {
setFlags(enabled ? 0 : FILTER_TOUCHES_WHEN_OBSCURED, setFlags(enabled ? FILTER_TOUCHES_WHEN_OBSCURED : 0,
FILTER_TOUCHES_WHEN_OBSCURED); FILTER_TOUCHES_WHEN_OBSCURED);
} }