summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2013-10-29 10:41:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-29 10:41:06 -0700
commitaf5d6e49526e97a267bedf076797fde6e9589bba (patch)
tree79154e2bfe569c2d92a747c0aa006c4eef83f366 /packages/Keyguard
parent07873e3a72da254bcdf965f6fa76bdcc800ef511 (diff)
parentf535a6aef04b9673a0f6748da0018b962833dd9e (diff)
downloadframeworks_base-af5d6e49526e97a267bedf076797fde6e9589bba.zip
frameworks_base-af5d6e49526e97a267bedf076797fde6e9589bba.tar.gz
frameworks_base-af5d6e49526e97a267bedf076797fde6e9589bba.tar.bz2
am f535a6ae: am 5ab93d87: Merge "reduce garbage generation in KeyguardTransportControlView." into klp-dev
* commit 'f535a6aef04b9673a0f6748da0018b962833dd9e': reduce garbage generation in KeyguardTransportControlView.
Diffstat (limited to 'packages/Keyguard')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java23
1 files changed, 15 insertions, 8 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
index de26efb..8095ecf 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
@@ -92,6 +92,9 @@ public class KeyguardTransportControlView extends FrameLayout {
private boolean mUserSeeking;
private java.text.DateFormat mFormat;
+ private Date mTimeElapsed;
+ private Date mTimeRemaining;
+
/**
* The metadata which should be populated into the view once we've been attached
*/
@@ -452,15 +455,19 @@ public class KeyguardTransportControlView extends FrameLayout {
void updateSeekDisplay() {
if (mMetadata != null && mRemoteController != null && mFormat != null) {
- final long timeElapsed = mRemoteController.getEstimatedMediaPosition();
- final long duration = mMetadata.duration;
- final long remaining = duration - timeElapsed;
-
- mTransientSeekTimeElapsed.setText(mFormat.format(new Date(timeElapsed)));
- mTransientSeekTimeRemaining.setText(mFormat.format(new Date(remaining)));
+ if (mTimeElapsed == null) {
+ mTimeElapsed = new Date();
+ }
+ if (mTimeRemaining == null) {
+ mTimeRemaining = new Date();
+ }
+ mTimeElapsed.setTime(mRemoteController.getEstimatedMediaPosition());
+ mTimeRemaining.setTime(mMetadata.duration - mTimeElapsed.getTime());
+ mTransientSeekTimeElapsed.setText(mFormat.format(mTimeElapsed));
+ mTransientSeekTimeRemaining.setText(mFormat.format(mTimeRemaining));
- if (DEBUG) Log.d(TAG, "updateSeekDisplay timeElapsed=" + timeElapsed +
- " duration=" + duration + " remaining=" + remaining);
+ if (DEBUG) Log.d(TAG, "updateSeekDisplay timeElapsed=" + mTimeElapsed +
+ " duration=" + mMetadata.duration + " remaining=" + mTimeRemaining);
}
}