Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9635e60 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with... 

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

* commit 'c83a6121':
  Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
parents 51591b91 c83a6121

core/java/android/view/View.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -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