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

Commit 995f4b57 authored by Ben Weiss's avatar Ben Weiss Committed by Android (Google) Code Review
Browse files

Merge "Extract and unhide TransitionListenerAdapter"

parents 85a05cd9 e0c37bde

api/current.txt

+9 −0
Original line number Original line Diff line number Diff line
@@ -41949,6 +41949,15 @@ package android.transition { 
    method public android.transition.TransitionManager inflateTransitionManager(int, android.view.ViewGroup);

    method public android.transition.TransitionManager inflateTransitionManager(int, android.view.ViewGroup);

  }

  }




















  public abstract class TransitionListenerAdapter implements android.transition.Transition.TransitionListener {














    ctor public TransitionListenerAdapter();














    method public void onTransitionCancel(android.transition.Transition);














    method public void onTransitionEnd(android.transition.Transition);














    method public void onTransitionPause(android.transition.Transition);














    method public void onTransitionResume(android.transition.Transition);














    method public void onTransitionStart(android.transition.Transition);














  }
























  public class TransitionManager {







  public class TransitionManager {











    ctor public TransitionManager();







    ctor public TransitionManager();











    method public static void beginDelayedTransition(android.view.ViewGroup);







    method public static void beginDelayedTransition(android.view.ViewGroup);

























api/system-current.txt



+9
−0




























Original line number
Original line
Diff line number
Diff line








@@ -45355,6 +45355,15 @@ package android.transition {









    method public android.transition.TransitionManager inflateTransitionManager(int, android.view.ViewGroup);







    method public android.transition.TransitionManager inflateTransitionManager(int, android.view.ViewGroup);











  }







  }






























  public abstract class TransitionListenerAdapter implements android.transition.Transition.TransitionListener {














    ctor public TransitionListenerAdapter();














    method public void onTransitionCancel(android.transition.Transition);














    method public void onTransitionEnd(android.transition.Transition);














    method public void onTransitionPause(android.transition.Transition);














    method public void onTransitionResume(android.transition.Transition);














    method public void onTransitionStart(android.transition.Transition);














  }
























  public class TransitionManager {







  public class TransitionManager {











    ctor public TransitionManager();







    ctor public TransitionManager();











    method public static void beginDelayedTransition(android.view.ViewGroup);







    method public static void beginDelayedTransition(android.view.ViewGroup);

























api/test-current.txt



+9
−0




























Original line number
Original line
Diff line number
Diff line








@@ -42088,6 +42088,15 @@ package android.transition {









    method public android.transition.TransitionManager inflateTransitionManager(int, android.view.ViewGroup);







    method public android.transition.TransitionManager inflateTransitionManager(int, android.view.ViewGroup);











  }







  }






























  public abstract class TransitionListenerAdapter implements android.transition.Transition.TransitionListener {














    ctor public TransitionListenerAdapter();














    method public void onTransitionCancel(android.transition.Transition);














    method public void onTransitionEnd(android.transition.Transition);














    method public void onTransitionPause(android.transition.Transition);














    method public void onTransitionResume(android.transition.Transition);














    method public void onTransitionStart(android.transition.Transition);














  }
























  public class TransitionManager {







  public class TransitionManager {











    ctor public TransitionManager();







    ctor public TransitionManager();











    method public static void beginDelayedTransition(android.view.ViewGroup);







    method public static void beginDelayedTransition(android.view.ViewGroup);

























core/java/android/app/ActivityOptions.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -33,6 +33,7 @@ import android.os.Parcelable;









import android.os.RemoteException;







import android.os.RemoteException;











import android.os.ResultReceiver;







import android.os.ResultReceiver;











import android.transition.Transition;







import android.transition.Transition;














import android.transition.TransitionListenerAdapter;











import android.transition.TransitionManager;







import android.transition.TransitionManager;











import android.util.Pair;







import android.util.Pair;











import android.util.Slog;







import android.util.Slog;










@@ -1342,7 +1343,7 @@ public class ActivityOptions {









                + mStartY + ", mWidth=" + mWidth + ", mHeight=" + mHeight;







                + mStartY + ", mWidth=" + mWidth + ", mHeight=" + mHeight;











    }







    }































    private static class HideWindowListener extends Transition.TransitionListenerAdapter







    private static class HideWindowListener extends TransitionListenerAdapter











        implements ExitTransitionCoordinator.HideSharedElementsCallback {







        implements ExitTransitionCoordinator.HideSharedElementsCallback {











        private final Window mWindow;







        private final Window mWindow;











        private final ExitTransitionCoordinator mExit;







        private final ExitTransitionCoordinator mExit;

































core/java/android/app/ActivityTransitionCoordinator.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -24,6 +24,7 @@ import android.os.Handler;









import android.os.Parcelable;







import android.os.Parcelable;











import android.os.ResultReceiver;







import android.os.ResultReceiver;











import android.transition.Transition;







import android.transition.Transition;














import android.transition.TransitionListenerAdapter;











import android.transition.TransitionSet;







import android.transition.TransitionSet;











import android.transition.Visibility;







import android.transition.Visibility;











import android.util.ArrayMap;







import android.util.ArrayMap;










@@ -916,7 +917,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {





























    protected void onTransitionsComplete() {}







    protected void onTransitionsComplete() {}































    protected class ContinueTransitionListener extends Transition.TransitionListenerAdapter {







    protected class ContinueTransitionListener extends TransitionListenerAdapter {











        @Override







        @Override











        public void onTransitionStart(Transition transition) {







        public void onTransitionStart(Transition transition) {











            mIsStartingTransition = false;







            mIsStartingTransition = false;