diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2011-10-14 09:02:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-14 09:02:49 -0700 |
| commit | 76842baa0f6d079bcb8933bb14a7a4dbb89db781 (patch) | |
| tree | 3f3bf40a878d3619706d6b08b7e5c849741185b9 /core/java/com | |
| parent | 69fe4e0b04abf461f017f4c972e946509dec29c2 (diff) | |
| parent | 9ad680ca2be19679c355de9526d79ded2887ea97 (diff) | |
| download | frameworks_base-76842baa0f6d079bcb8933bb14a7a4dbb89db781.zip frameworks_base-76842baa0f6d079bcb8933bb14a7a4dbb89db781.tar.gz frameworks_base-76842baa0f6d079bcb8933bb14a7a4dbb89db781.tar.bz2 | |
am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0
* commit '9ad680ca2be19679c355de9526d79ded2887ea97':
Fix 5380695 Lockscreen transport control must reflect error state
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/TransportControlView.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/TransportControlView.java b/core/java/com/android/internal/widget/TransportControlView.java index 73d9f10..8f6f839 100644 --- a/core/java/com/android/internal/widget/TransportControlView.java +++ b/core/java/com/android/internal/widget/TransportControlView.java @@ -339,6 +339,13 @@ public class TransportControlView extends FrameLayout implements OnClickListener final int imageResId; final int imageDescId; switch (state) { + case RemoteControlClient.PLAYSTATE_ERROR: + imageResId = com.android.internal.R.drawable.stat_sys_warning; + // TODO use more specific image description string for warning, but here the "play" + // message is still valid because this button triggers a play command. + imageDescId = com.android.internal.R.string.lockscreen_transport_play_description; + break; + case RemoteControlClient.PLAYSTATE_PLAYING: imageResId = com.android.internal.R.drawable.ic_media_pause; imageDescId = com.android.internal.R.string.lockscreen_transport_pause_description; |