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

Commit 57a28986 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make getTransition a @TestApi for CTS tests."

parents 854036d5 f239f991

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -40167,6 +40167,7 @@ package android.transition { 
    method public static void beginDelayedTransition(android.view.ViewGroup);

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

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

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

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

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

    method public android.transition.Transition getTransition(android.transition.Scene);

    method public static void go(android.transition.Scene);

    method public static void go(android.transition.Scene);

    method public static void go(android.transition.Scene, android.transition.Transition);

    method public static void go(android.transition.Scene, android.transition.Transition);

    method public void setTransition(android.transition.Scene, android.transition.Transition);

    method public void setTransition(android.transition.Scene, android.transition.Transition);

core/java/android/transition/TransitionManager.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.transition;

package android.transition;





import android.annotation.TestApi;

import android.content.Context;

import android.content.Context;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.Log;

import android.util.Log;
@@ -147,8 +148,10 @@ public class TransitionManager { 
     * @return The Transition to be used for the given scene change. If no

     * @return The Transition to be used for the given scene change. If no

     * Transition was specified for this scene change, the default transition

     * Transition was specified for this scene change, the default transition

     * will be used instead.

     * will be used instead.

     * @hide

     */

     */

    private Transition getTransition(Scene scene) {

    @TestApi

    public Transition getTransition(Scene scene) {

        Transition transition = null;

        Transition transition = null;

        ViewGroup sceneRoot = scene.getSceneRoot();

        ViewGroup sceneRoot = scene.getSceneRoot();

        if (sceneRoot != null) {

        if (sceneRoot != null) {