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

Commit 5fa0422c authored by Tiger Huang's avatar Tiger Huang Committed by Automerger Merge Worker
Browse files

Merge "Prevent adding methods in WindowInsetsAnimationController" into... 

Merge "Prevent adding methods in WindowInsetsAnimationController" into sc-v2-dev am: 4fba1c44 am: a1c59702

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15746916

Change-Id: I5224d890d1632148fd2a89a39d8b68c0d7386311
parents fdf6dd03 a1c59702

core/java/android/view/InsetsAnimationControlCallbacks.java

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public interface InsetsAnimationControlCallbacks { 
     *     <li>Dispatch {@link WindowInsetsAnimationControlListener#onReady}</li>

     * </ul>

     */

    <T extends InsetsAnimationControlRunner & WindowInsetsAnimationController>

    <T extends InsetsAnimationControlRunner & InternalInsetsAnimationController>

    void startAnimation(T runner, WindowInsetsAnimationControlListener listener, int types,

            WindowInsetsAnimation animation, Bounds bounds);

core/java/android/view/InsetsAnimationControlImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ import java.util.Objects; 
 * @hide

 */

@VisibleForTesting

public class InsetsAnimationControlImpl implements WindowInsetsAnimationController,

public class InsetsAnimationControlImpl implements InternalInsetsAnimationController,

        InsetsAnimationControlRunner {



    private static final String TAG = "InsetsAnimationCtrlImpl";

core/java/android/view/InsetsAnimationThreadControlRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro 


        @Override

        @UiThread

        public <T extends InsetsAnimationControlRunner & WindowInsetsAnimationController>

        public <T extends InsetsAnimationControlRunner & InternalInsetsAnimationController>

        void startAnimation(T runner, WindowInsetsAnimationControlListener listener, int types,

                WindowInsetsAnimation animation, Bounds bounds) {

            // Animation will be started in constructor already.

core/java/android/view/InsetsController.java

+2 −2
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
                        runningAnimations.add(runner.getAnimation());

                    }



                    if (((WindowInsetsAnimationController) runner).applyChangeInsets(state)) {

                    if (((InternalInsetsAnimationController) runner).applyChangeInsets(state)) {

                        finishedAnimations.add(runner.getAnimation());

                    }

                }
@@ -1513,7 +1513,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 


    @VisibleForTesting

    @Override

    public <T extends InsetsAnimationControlRunner & WindowInsetsAnimationController>

    public <T extends InsetsAnimationControlRunner & InternalInsetsAnimationController>

    void startAnimation(T runner, WindowInsetsAnimationControlListener listener, int types,

            WindowInsetsAnimation animation, Bounds bounds) {

        mHost.dispatchWindowInsetsAnimationPrepare(animation);

core/java/android/view/InsetsResizeAnimationRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import android.view.animation.Interpolator; 
 * @hide

 */

public class InsetsResizeAnimationRunner implements InsetsAnimationControlRunner,

        WindowInsetsAnimationController, WindowInsetsAnimationControlListener {

        InternalInsetsAnimationController, WindowInsetsAnimationControlListener {



    private final InsetsState mFromState;

    private final InsetsState mToState;