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

Commit 8f249945 authored by Chet Haase's avatar Chet Haase Committed by The Android Automerger
Browse files

Disable ActionBar transitions 

A problem with transitions is causing various ActionBar icons to go
missing occasionally. This CL disables these transitions for now
to allow ActionBar to work as expected.

Issue #10726905 ActionBar weirdness in People app

Change-Id: I0cb774840ae84cbb733d65865f8c1b4c6d7490fa
parent fb77b6da

core/java/android/transition/TransitionManager.java

+18 −14
Original line number Diff line number Diff line
@@ -342,19 +342,23 @@ public class TransitionManager { 
     * value of null causes the TransitionManager to use the default transition.

     */

    public static void beginDelayedTransition(final ViewGroup sceneRoot, Transition transition) {

        if (!sPendingTransitions.contains(sceneRoot) && sceneRoot.isLaidOut()) {

            if (Transition.DBG) {

                Log.d(LOG_TAG, "beginDelayedTransition: root, transition = " +

                        sceneRoot + ", " + transition);

            }

            sPendingTransitions.add(sceneRoot);

            if (transition == null) {

                transition = sDefaultTransition;

            }

            final Transition finalTransition = transition.clone();

            sceneChangeSetup(sceneRoot, transition);

            Scene.setCurrentScene(sceneRoot, null);

            sceneChangeRunTransition(sceneRoot, finalTransition);

        }



        // TEMPORARY: disabling delayed transitions until a fix for the various ActionBar-

        // triggered artifacts is found



//        if (!sPendingTransitions.contains(sceneRoot) && sceneRoot.isLaidOut()) {

//            if (Transition.DBG) {

//                Log.d(LOG_TAG, "beginDelayedTransition: root, transition = " +

//                        sceneRoot + ", " + transition);

//            }

//            sPendingTransitions.add(sceneRoot);

//            if (transition == null) {

//                transition = sDefaultTransition;

//            }

//            final Transition finalTransition = transition.clone();

//            sceneChangeSetup(sceneRoot, transition);

//            Scene.setCurrentScene(sceneRoot, null);

//            sceneChangeRunTransition(sceneRoot, finalTransition);

//        }

    }

}