Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d9635e60: am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev

Browse Source 
* commit 'd9635e60f00ccd10187a6dd0c51243a201d55ab3':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
This commit is contained in:
Alan Viverette
2015-10-12 19:52:12 +00:00
committed by Android Git Automerger
parent ff71f26fc5 d9635e60f0
commit ff95329400
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/View.java
View File

@@ -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