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

am 845d9192: Merge "Enable transitions in lockscreen media controller" into klp-dev

Browse Source 
* commit '845d9192d7bc822f3c3dc30643d66f7d66249566':
  Enable transitions in lockscreen media controller
This commit is contained in:
Chet Haase
2013-10-04 16:30:22 -07:00
committed by Android Git Automerger
parent 9edb77412e 845d9192d7
commit 3980ae478b
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/transition/ChangeText.java
View File

@@ -179,8 +179,8 @@ public class ChangeText extends Transition {
startSelectionStart = startSelectionEnd = endSelectionStart = endSelectionEnd = -1;
}
if (!startText.equals(endText)) {
final int startColor = (Integer) startVals.get(PROPNAME_TEXT_COLOR);
final int endColor = (Integer) endVals.get(PROPNAME_TEXT_COLOR);
final int startColor;
final int endColor;
if (mChangeBehavior != CHANGE_BEHAVIOR_IN) {
view.setText(startText);
if (view instanceof EditText) {
@@ -189,6 +189,7 @@ public class ChangeText extends Transition {
}
Animator anim;
if (mChangeBehavior == CHANGE_BEHAVIOR_KEEP) {
startColor = endColor = 0;
anim = ValueAnimator.ofFloat(0, 1);
anim.addListener(new AnimatorListenerAdapter() {
@Override
@@ -203,6 +204,8 @@ public class ChangeText extends Transition {
}
});
} else {
startColor = (Integer) startVals.get(PROPNAME_TEXT_COLOR);
endColor = (Integer) endVals.get(PROPNAME_TEXT_COLOR);
// Fade out start text
ValueAnimator outAnim = null, inAnim = null;
if (mChangeBehavior == CHANGE_BEHAVIOR_OUT_IN ||

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

@@ -240,12 +240,7 @@ public class TransitionManager {
}
transition.playTransition(sceneRoot);
// Returning false from onPreDraw() skips the current frame. This is
// necessary to avoid artifacts caused by resetting target views
// to their proper end states for capturing. Waiting until the next
// frame to draw allows these views to have their mid-transition
// values set on them again and avoid artifacts.
return false;
return true;
}
};
observer.addOnPreDrawListener(listener);

2
packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
View File

@@ -63,7 +63,7 @@ public class KeyguardTransportControlView extends FrameLayout {
protected static final boolean DEBUG = false;
protected static final String TAG = "TransportControlView";
private static final boolean ANIMATE_TRANSITIONS = false;
private static final boolean ANIMATE_TRANSITIONS = true;
private ViewGroup mMetadataContainer;
private ViewGroup mInfoContainer;