Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable ActionBar transitions" into klp-dev

Browse Source
This commit is contained in:
Geoff Mendal
2013-09-14 02:08:20 +00:00
committed by Android (Google) Code Review
parent e39ced0f7c 7d077d0364
commit c028d8f05c
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/transition/TransitionManager.java
View File

@@ -342,19 +342,23 @@ public class TransitionManager {
* value of null causes the TransitionManager to use the default transition. * value of null causes the TransitionManager to use the default transition.
*/ */
public static void beginDelayedTransition(final ViewGroup sceneRoot, Transition transition) { public static void beginDelayedTransition(final ViewGroup sceneRoot, Transition transition) {
if (!sPendingTransitions.contains(sceneRoot) && sceneRoot.isLaidOut()) {
if (Transition.DBG) { // TEMPORARY: disabling delayed transitions until a fix for the various ActionBar-
Log.d(LOG_TAG, "beginDelayedTransition: root, transition = " + // triggered artifacts is found
sceneRoot + ", " + transition);
} // if (!sPendingTransitions.contains(sceneRoot) && sceneRoot.isLaidOut()) {
sPendingTransitions.add(sceneRoot); // if (Transition.DBG) {
if (transition == null) { // Log.d(LOG_TAG, "beginDelayedTransition: root, transition = " +
transition = sDefaultTransition; // sceneRoot + ", " + transition);
} // }
final Transition finalTransition = transition.clone(); // sPendingTransitions.add(sceneRoot);
sceneChangeSetup(sceneRoot, transition); // if (transition == null) {
Scene.setCurrentScene(sceneRoot, null); // transition = sDefaultTransition;
sceneChangeRunTransition(sceneRoot, finalTransition); // }
} // final Transition finalTransition = transition.clone();
// sceneChangeSetup(sceneRoot, transition);
// Scene.setCurrentScene(sceneRoot, null);
// sceneChangeRunTransition(sceneRoot, finalTransition);
// }
} }
} }