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

am c028d8f0: Merge "Disable ActionBar transitions" into klp-dev

Browse Source 
* commit 'c028d8f05c0cf32489bd369ce5612ce6a4077e7a':
  Disable ActionBar transitions
This commit is contained in:
Geoff Mendal
2013-09-13 19:09:47 -07:00
committed by Android Git Automerger
parent 38743f2a67 c028d8f05c
commit 6689c674d9
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.
*/
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);
// }
}
}