diff options
| author | 2015-10-12 19:46:31 +0000 | |
|---|---|---|
| committer | 2015-10-12 19:46:31 +0000 | |
| commit | d9635e60f00ccd10187a6dd0c51243a201d55ab3 (patch) | |
| tree | a0b08c174259d737c6eb16b385976dc38f6d968b | |
| parent | 51591b91a35f1227996121c2803990a62b328475 (diff) | |
| parent | c83a6121d214631c0a52be5b2c5c8ce2f6470ed0 (diff) | |
am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit 'c83a6121d214631c0a52be5b2c5c8ce2f6470ed0':
Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
| -rw-r--r-- | core/java/android/view/View.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 43c578fe7faf..dea004e3ee34 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -2355,7 +2355,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * 1 PFLAG3_APPLYING_INSETS * 1 PFLAG3_FITTING_SYSTEM_WINDOWS * 1 PFLAG3_NESTED_SCROLLING_ENABLED - * 1 PFLAG3_ASSIST_BLOCKED + * 1 PFLAG3_SCROLL_INDICATOR_TOP + * 1 PFLAG3_SCROLL_INDICATOR_BOTTOM + * 1 PFLAG3_SCROLL_INDICATOR_LEFT + * 1 PFLAG3_SCROLL_INDICATOR_RIGHT + * 1 PFLAG3_SCROLL_INDICATOR_START + * 1 PFLAG3_SCROLL_INDICATOR_END + * 1 PFLAG3_ASSIST_BLOCKED * |-------|-------|-------|-------| */ @@ -2549,7 +2555,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * <p>Indicates that we are allowing {@link ViewStructure} to traverse * into this view.<p> */ - static final int PFLAG3_ASSIST_BLOCKED = 0x100; + static final int PFLAG3_ASSIST_BLOCKED = 0x4000; /** * Always allow a user to over-scroll this view, provided it is a |