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

Commit 24df931e authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Unhide View#dispatch{Start,Finish}TemporaryDetach() 

In order to fix Bug 18920212, we have to track when a View enters
temporarily detached state and when it exits from that state. To do
that, ListView needs to use View#dispatchStartTemporaryDetach() instead
of directly calling View#onStartTemporaryDetach() because there is no
guarantee that existing applications have internally followed Call-Super
pattern.

With this CL, we are going to expose temporary detach state and its
dispatching methods as public APIs.  Major changes are:
  1. ListView's indirect children will start receiving temporary
     dispatch callbacks. Previously only direct children have received
     View#on{Start, Finish}TemporaryDetach() callbacks.
  2. TextView can no longer assume that ListView never calls
     View#View#dispatchStartTemporaryDetach() but directly call
     View#onStartTemporaryDetach() instead. See the commit message
     of [1] for details.

This also enables us to do the following fixes, which will be handled in
subsequent CLs.
  A. ViewCompat support lib is finally able to rely on temporary
     dispatch mechanism without reflection.
  B. InputMethodManager is now able to ignore focus-in events from
     temporarily detached Views. This will be done in the next CL [2].

  [1]: a440b002
  [2]: Ia79bbd8468f768d546354382b47b39dd31ef7bb5

Bug: 18920212
Bug: 27905921
Change-Id: If8f780f8b71754f7533a65097304113ae1f5cf12
parent 9a99629e

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -42314,6 +42314,7 @@ package android.view { 
    method public boolean dispatchDragEvent(android.view.DragEvent);

    method protected void dispatchDraw(android.graphics.Canvas);

    method public void dispatchDrawableHotspotChanged(float, float);

    method public void dispatchFinishTemporaryDetach();

    method protected boolean dispatchGenericFocusedEvent(android.view.MotionEvent);

    method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);

    method protected boolean dispatchGenericPointerEvent(android.view.MotionEvent);
@@ -42333,6 +42334,7 @@ package android.view { 
    method protected void dispatchSetActivated(boolean);

    method protected void dispatchSetPressed(boolean);

    method protected void dispatchSetSelected(boolean);

    method public void dispatchStartTemporaryDetach();

    method public void dispatchSystemUiVisibilityChanged(int);

    method public boolean dispatchTouchEvent(android.view.MotionEvent);

    method public boolean dispatchTrackballEvent(android.view.MotionEvent);
@@ -42545,6 +42547,7 @@ package android.view { 
    method public boolean isSelected();

    method public boolean isShown();

    method public boolean isSoundEffectsEnabled();

    method public final boolean isTemporarilyDetached();

    method public boolean isTextAlignmentResolved();

    method public boolean isTextDirectionResolved();

    method public boolean isVerticalFadingEdgeEnabled();

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -45040,6 +45040,7 @@ package android.view { 
    method public boolean dispatchDragEvent(android.view.DragEvent);

    method protected void dispatchDraw(android.graphics.Canvas);

    method public void dispatchDrawableHotspotChanged(float, float);

    method public void dispatchFinishTemporaryDetach();

    method protected boolean dispatchGenericFocusedEvent(android.view.MotionEvent);

    method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);

    method protected boolean dispatchGenericPointerEvent(android.view.MotionEvent);
@@ -45059,6 +45060,7 @@ package android.view { 
    method protected void dispatchSetActivated(boolean);

    method protected void dispatchSetPressed(boolean);

    method protected void dispatchSetSelected(boolean);

    method public void dispatchStartTemporaryDetach();

    method public void dispatchSystemUiVisibilityChanged(int);

    method public boolean dispatchTouchEvent(android.view.MotionEvent);

    method public boolean dispatchTrackballEvent(android.view.MotionEvent);
@@ -45271,6 +45273,7 @@ package android.view { 
    method public boolean isSelected();

    method public boolean isShown();

    method public boolean isSoundEffectsEnabled();

    method public final boolean isTemporarilyDetached();

    method public boolean isTextAlignmentResolved();

    method public boolean isTextDirectionResolved();

    method public boolean isVerticalFadingEdgeEnabled();

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -42388,6 +42388,7 @@ package android.view { 
    method public boolean dispatchDragEvent(android.view.DragEvent);

    method protected void dispatchDraw(android.graphics.Canvas);

    method public void dispatchDrawableHotspotChanged(float, float);

    method public void dispatchFinishTemporaryDetach();

    method protected boolean dispatchGenericFocusedEvent(android.view.MotionEvent);

    method public boolean dispatchGenericMotionEvent(android.view.MotionEvent);

    method protected boolean dispatchGenericPointerEvent(android.view.MotionEvent);
@@ -42407,6 +42408,7 @@ package android.view { 
    method protected void dispatchSetActivated(boolean);

    method protected void dispatchSetPressed(boolean);

    method protected void dispatchSetSelected(boolean);

    method public void dispatchStartTemporaryDetach();

    method public void dispatchSystemUiVisibilityChanged(int);

    method public boolean dispatchTouchEvent(android.view.MotionEvent);

    method public boolean dispatchTrackballEvent(android.view.MotionEvent);
@@ -42619,6 +42621,7 @@ package android.view { 
    method public boolean isSelected();

    method public boolean isShown();

    method public boolean isSoundEffectsEnabled();

    method public final boolean isTemporarilyDetached();

    method public boolean isTextAlignmentResolved();

    method public boolean isTextDirectionResolved();

    method public boolean isVerticalFadingEdgeEnabled();

core/java/android/view/View.java

+26 −2
Original line number Diff line number Diff line
@@ -2434,6 +2434,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *           11111111                PFLAG3_POINTER_ICON_MASK

     *          1                        PFLAG3_OVERLAPPING_RENDERING_FORCED_VALUE

     *         1                         PFLAG3_HAS_OVERLAPPING_RENDERING_FORCED

     *        1                          PFLAG3_TEMPORARY_DETACH

     * |-------|-------|-------|-------|

     */










@@ -2667,6 +2668,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     */















    private static final int PFLAG3_HAS_OVERLAPPING_RENDERING_FORCED = 0x1000000;



























    /**













     * Flag indicating that the view is temporarily detached from the parent view.













     *













     * @see #onStartTemporaryDetach()













     * @see #onFinishTemporaryDetach()













     */













    static final int PFLAG3_TEMPORARY_DETACH = 0x2000000;



























    /* End of masks for mPrivateFlags3 */





























    /**










@@ -9735,9 +9744,20 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













    }





























    /**













     * @hide













     * @return {@code true} when the View is in the state between {@link #onStartTemporaryDetach()}













     * and {@link #onFinishTemporaryDetach()}.













     */













    public final boolean isTemporarilyDetached() {













        return (mPrivateFlags3 & PFLAG3_TEMPORARY_DETACH) != 0;













    }

























    /**













     * Dispatch {@link #onStartTemporaryDetach()} to this View and its direct children if this is













     * a container View.















     */













    @CallSuper















    public void dispatchStartTemporaryDetach() {













        mPrivateFlags3 |= PFLAG3_TEMPORARY_DETACH;















        onStartTemporaryDetach();















    }























@@ -9753,10 +9773,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













    }





























    /**













     * @hide













     * Dispatch {@link #onFinishTemporaryDetach()} to this View and its direct children if this is













     * a container View.















     */













    @CallSuper















    public void dispatchFinishTemporaryDetach() {















        onFinishTemporaryDetach();













        mPrivateFlags3 &= ~PFLAG3_TEMPORARY_DETACH;















    }





























    /**










@@ -15187,6 +15210,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













    protected void onDetachedFromWindowInternal() {















        mPrivateFlags &= ~PFLAG_CANCEL_NEXT_UP_EVENT;















        mPrivateFlags3 &= ~PFLAG3_IS_LAID_OUT;













        mPrivateFlags3 &= ~PFLAG3_TEMPORARY_DETACH;





























        removeUnsetPressCallback();















        removeLongPressCallback();

























core/java/android/widget/AutoCompleteTextView.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1116,7 +1116,7 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe













    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {















        super.onFocusChanged(focused, direction, previouslyFocusedRect);





























        if (mTemporaryDetach) {













        if (isTemporarilyDetached()) {















            // If we are temporarily in the detach state, then do nothing.















            return;















        }