summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-10-04 17:37:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 17:37:11 -0700
commitb0891e66b4ea620c38556cfbc98f9470b4f863e4 (patch)
treecfe9b28cc391cdd2d58a63ed2e398f8bf89ff953 /packages
parentfb205d10966077c35553bf40673ab7f48244a7a6 (diff)
parent5c44b36b2a5f44bdba53244ee423aeeea14c485e (diff)
downloadframeworks_base-b0891e66b4ea620c38556cfbc98f9470b4f863e4.zip
frameworks_base-b0891e66b4ea620c38556cfbc98f9470b4f863e4.tar.gz
frameworks_base-b0891e66b4ea620c38556cfbc98f9470b4f863e4.tar.bz2
am 5c44b36b: am 3980ae47: am 845d9192: Merge "Enable transitions in lockscreen media controller" into klp-dev
* commit '5c44b36b2a5f44bdba53244ee423aeeea14c485e': Enable transitions in lockscreen media controller
Diffstat (limited to 'packages')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
index 83d8ab1..45aedbd 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
@@ -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;