drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "show duration instead of remaining time." into klp-dev

Browse Source
This commit is contained in:
Chris Wren
2013-10-29 17:37:29 +00:00
committed by Android (Google) Code Review
parent 5ab93d873f 6af85cc2c6
commit 64742f8469
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@ public class KeyguardTransportControlView extends FrameLayout {
private View mTransientSeek;
private SeekBar mTransientSeekBar;
private TextView mTransientSeekTimeElapsed;
private TextView mTransientSeekTimeRemaining;
private TextView mTransientSeekTimeTotal;
private ImageView mBtnPrev;
private ImageView mBtnPlay;
@ -93,7 +93,7 @@ public class KeyguardTransportControlView extends FrameLayout {
private java.text.DateFormat mFormat;
private Date mTimeElapsed;
private Date mTimeRemaining;
private Date mTrackDuration;
/**
* The metadata which should be populated into the view once we've been attached
@ -281,7 +281,7 @@ public class KeyguardTransportControlView extends FrameLayout {
mTransientSeekBar = (SeekBar) findViewById(R.id.transient_seek_bar);
mTransientSeekBar.setOnSeekBarChangeListener(mOnSeekBarChangeListener);
mTransientSeekTimeElapsed = (TextView) findViewById(R.id.transient_seek_time_elapsed);
mTransientSeekTimeRemaining = (TextView) findViewById(R.id.transient_seek_time_remaining);
mTransientSeekTimeTotal = (TextView) findViewById(R.id.transient_seek_time_remaining);
mBtnPrev = (ImageView) findViewById(R.id.btn_prev);
mBtnPlay = (ImageView) findViewById(R.id.btn_play);
mBtnNext = (ImageView) findViewById(R.id.btn_next);
@ -458,16 +458,16 @@ public class KeyguardTransportControlView extends FrameLayout {
if (mTimeElapsed == null) {
mTimeElapsed = new Date();
}
if (mTimeRemaining == null) {
mTimeRemaining = new Date();
if (mTrackDuration == null) {
mTrackDuration = new Date();
}
mTimeElapsed.setTime(mRemoteController.getEstimatedMediaPosition());
mTimeRemaining.setTime(mMetadata.duration - mTimeElapsed.getTime());
mTrackDuration.setTime(mMetadata.duration);
mTransientSeekTimeElapsed.setText(mFormat.format(mTimeElapsed));
mTransientSeekTimeRemaining.setText(mFormat.format(mTimeRemaining));
mTransientSeekTimeTotal.setText(mFormat.format(mTrackDuration));
if (DEBUG) Log.d(TAG, "updateSeekDisplay timeElapsed=" + mTimeElapsed +
" duration=" + mMetadata.duration + " remaining=" + mTimeRemaining);
" duration=" + mMetadata.duration);
}
}