diff options
| author | Alan Viverette <alanv@google.com> | 2015-10-12 19:41:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-12 19:41:10 +0000 |
| commit | c83a6121d214631c0a52be5b2c5c8ce2f6470ed0 (patch) | |
| tree | 03009bc3b006bb5d9477819da838fd44433b08c3 | |
| parent | 6cc3735a492abd1c17f15a46287de70e62bf116d (diff) | |
| parent | 3b493179770041aaa6bb9b0654e4cecd136fc937 (diff) | |
| download | frameworks_base-c83a6121d214631c0a52be5b2c5c8ce2f6470ed0.zip frameworks_base-c83a6121d214631c0a52be5b2c5c8ce2f6470ed0.tar.gz frameworks_base-c83a6121d214631c0a52be5b2c5c8ce2f6470ed0.tar.bz2 | |
Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
| -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 43c578f..dea004e 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 |