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

Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-10-12 19:41:10 +00:00
committed by Android (Google) Code Review
parent 6cc3735a49 3b49317977
commit c83a6121d2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2355,6 +2355,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* 1 PFLAG3_APPLYING_INSETS * 1 PFLAG3_APPLYING_INSETS
* 1 PFLAG3_FITTING_SYSTEM_WINDOWS * 1 PFLAG3_FITTING_SYSTEM_WINDOWS
* 1 PFLAG3_NESTED_SCROLLING_ENABLED * 1 PFLAG3_NESTED_SCROLLING_ENABLED
* 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 * 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 * <p>Indicates that we are allowing {@link ViewStructure} to traverse
* into this view.<p> * 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 * Always allow a user to over-scroll this view, provided it is a