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

am 11c746ab: am a9412556: Merge "Fix stale data in keyguard transport control display" into klp-dev

Browse Source 
* commit '11c746abf3793cf122a353dbee1d73e2eddbfb82':
  Fix stale data in keyguard transport control display
This commit is contained in:
Adam Powell
2013-10-17 10:35:17 -07:00
committed by Android Git Automerger
parent 406e9a01c3 11c746abf3
commit 16f495dfa4
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/java/android/media/RemoteController.java
View File

@@ -812,6 +812,7 @@ public final class RemoteController
final OnClientUpdateListener l;
synchronized(mInfoLock) {
l = mOnClientUpdateListener;
mMetadataEditor = null;
}
if (l != null) {
l.onClientChange(clearing);

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

@@ -101,9 +101,7 @@ public class KeyguardTransportControlView extends FrameLayout {
new RemoteController.OnClientUpdateListener() {
@Override
public void onClientChange(boolean clearing) {
if (clearing) {
clearMetadata();
}
clearMetadata();
}
@Override
@@ -302,6 +300,7 @@ public class KeyguardTransportControlView extends FrameLayout {
mPopulateMetadataWhenAttached = null;
}
if (DEBUG) Log.v(TAG, "Registering TCV " + this);
mMetadata.clear();
mAudioManager.registerRemoteController(mRemoteController);
KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitor);
}
@@ -321,6 +320,7 @@ public class KeyguardTransportControlView extends FrameLayout {
if (DEBUG) Log.v(TAG, "Unregistering TCV " + this);
mAudioManager.unregisterRemoteController(mRemoteController);
KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mUpdateMonitor);
mMetadata.clear();
mUserSeeking = false;
removeCallbacks(mUpdateSeekBars);
}
@@ -395,10 +395,10 @@ public class KeyguardTransportControlView extends FrameLayout {
Log.e(TAG, "Couldn't get remote control client package icon", e);
}
setBadgeIcon(badgeIcon);
if (!TextUtils.isEmpty(mMetadata.trackTitle)) {
mTrackTitle.setText(mMetadata.trackTitle);
}
StringBuilder sb = new StringBuilder();
mTrackTitle.setText(!TextUtils.isEmpty(mMetadata.trackTitle)
? mMetadata.trackTitle : null);
final StringBuilder sb = new StringBuilder();
if (!TextUtils.isEmpty(mMetadata.artist)) {
if (sb.length() != 0) {
sb.append(" - ");
@@ -411,7 +411,10 @@ public class KeyguardTransportControlView extends FrameLayout {
}
sb.append(mMetadata.albumTitle);
}
mTrackArtistAlbum.setText(sb.toString());
final String trackArtistAlbum = sb.toString();
mTrackArtistAlbum.setText(!TextUtils.isEmpty(trackArtistAlbum) ?
trackArtistAlbum : null);
if (mMetadata.duration >= 0) {
setSeekBarsEnabled(true);