Merge "reduce garbage generation in KeyguardTransportControlView." into klp-dev

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 de26efb7eee6..8095ecfbab77 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);
         }
     }