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

Commit d215ddf3 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Fix API typo"

parents 5d76def6 1e878d2f

api/current.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -23818,8 +23818,9 @@ package android.view { 
    method public final void dispatchOnGlobalLayout();

    method public final void dispatchOnGlobalLayout();

    method public final boolean dispatchOnPreDraw();

    method public final boolean dispatchOnPreDraw();

    method public boolean isAlive();

    method public boolean isAlive();

    method public void removeGlobalOnLayoutListener(android.view.ViewTreeObserver.OnGlobalLayoutListener);

    method public deprecated void removeGlobalOnLayoutListener(android.view.ViewTreeObserver.OnGlobalLayoutListener);

    method public void removeOnGlobalFocusChangeListener(android.view.ViewTreeObserver.OnGlobalFocusChangeListener);

    method public void removeOnGlobalFocusChangeListener(android.view.ViewTreeObserver.OnGlobalFocusChangeListener);

    method public void removeOnGlobalLayoutListener(android.view.ViewTreeObserver.OnGlobalLayoutListener);

    method public void removeOnPreDrawListener(android.view.ViewTreeObserver.OnPreDrawListener);

    method public void removeOnPreDrawListener(android.view.ViewTreeObserver.OnPreDrawListener);

    method public void removeOnScrollChangedListener(android.view.ViewTreeObserver.OnScrollChangedListener);

    method public void removeOnScrollChangedListener(android.view.ViewTreeObserver.OnScrollChangedListener);

    method public void removeOnTouchModeChangeListener(android.view.ViewTreeObserver.OnTouchModeChangeListener);

    method public void removeOnTouchModeChangeListener(android.view.ViewTreeObserver.OnTouchModeChangeListener);

core/java/android/view/ViewTreeObserver.java

+18 −1
Original line number Original line Diff line number Diff line
@@ -185,7 +185,8 @@ public final class ViewTreeObserver { 
            mTouchableInsets = TOUCHABLE_INSETS_FRAME;

            mTouchableInsets = TOUCHABLE_INSETS_FRAME;

        }

        }

        

        

        @Override public boolean equals(Object o) {

        @Override

        public boolean equals(Object o) {

            try {

            try {

                if (o == null) {

                if (o == null) {

                    return false;

                    return false;
@@ -358,9 +359,25 @@ public final class ViewTreeObserver { 
     *

     *

     * @throws IllegalStateException If {@link #isAlive()} returns false

     * @throws IllegalStateException If {@link #isAlive()} returns false

     * 

     * 

     * @deprecated Use #removeOnGlobalLayoutListener instead

     *

     * @see #addOnGlobalLayoutListener(OnGlobalLayoutListener)

     * @see #addOnGlobalLayoutListener(OnGlobalLayoutListener)

     */

     */

    @Deprecated

    public void removeGlobalOnLayoutListener(OnGlobalLayoutListener victim) {

    public void removeGlobalOnLayoutListener(OnGlobalLayoutListener victim) {

        removeOnGlobalLayoutListener(victim);

    }



    /**

     * Remove a previously installed global layout callback

     *

     * @param victim The callback to remove

     *

     * @throws IllegalStateException If {@link #isAlive()} returns false

     * 

     * @see #addOnGlobalLayoutListener(OnGlobalLayoutListener)

     */

    public void removeOnGlobalLayoutListener(OnGlobalLayoutListener victim) {

        checkIsAlive();

        checkIsAlive();

        if (mOnGlobalLayoutListeners == null) {

        if (mOnGlobalLayoutListeners == null) {

            return;

            return;