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

am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0

Browse Source 
* commit '9ad680ca2be19679c355de9526d79ded2887ea97':
  Fix 5380695 Lockscreen transport control must reflect error state
This commit is contained in:
Jean-Michel Trivi
2011-10-14 09:02:49 -07:00
committed by Android Git Automerger
parent 69fe4e0b04 9ad680ca2b
commit 76842baa0f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/widget/TransportControlView.java
View File

@@ -339,6 +339,13 @@ public class TransportControlView extends FrameLayout implements OnClickListener
final int imageResId; final int imageResId;
final int imageDescId; final int imageDescId;
switch (state) { 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: case RemoteControlClient.PLAYSTATE_PLAYING:
imageResId = com.android.internal.R.drawable.ic_media_pause; imageResId = com.android.internal.R.drawable.ic_media_pause;
imageDescId = com.android.internal.R.string.lockscreen_transport_pause_description; imageDescId = com.android.internal.R.string.lockscreen_transport_pause_description;