Merge "Fix 5249234: Add contentDescription to buttons on transport control on lock screen." (66360acc) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/TransportControlView.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -336,20 +336,27 @@ public class TransportControlView extends FrameLayout implements OnClickListener
		if (state == mPlayState) {
		return;
		}
		final int imageResId;
		final int imageDescId;
		switch (state) {
		case RemoteControlClient.PLAYSTATE_PLAYING:
		mBtnPlay.setImageResource(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;
		break;

		case RemoteControlClient.PLAYSTATE_BUFFERING:
		mBtnPlay.setImageResource(com.android.internal.R.drawable.ic_media_stop);
		imageResId = com.android.internal.R.drawable.ic_media_stop;
		imageDescId = com.android.internal.R.string.lockscreen_transport_stop_description;
		break;

		case RemoteControlClient.PLAYSTATE_PAUSED:
		default:
		mBtnPlay.setImageResource(com.android.internal.R.drawable.ic_media_play);
		imageResId = com.android.internal.R.drawable.ic_media_play;
		imageDescId = com.android.internal.R.string.lockscreen_transport_play_description;
		break;
		}
		mBtnPlay.setImageResource(imageResId);
		mBtnPlay.setContentDescription(getResources().getString(imageDescId));
		mPlayState = state;
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -66,7 +66,8 @@
		android:src="@drawable/ic_media_rew"
		android:clickable="true"
		android:background="?android:attr/selectableItemBackground"
		android:padding="10dip"/>
		android:padding="10dip"
		android:contentDescription="@string/lockscreen_transport_prev_description"/>
		</FrameLayout>
		<FrameLayout
		android:layout_width="wrap_content"
		@@ -80,7 +81,8 @@
		android:clickable="true"
		android:src="@drawable/ic_media_play"
		android:background="?android:attr/selectableItemBackground"
		android:padding="10dip"/>
		android:padding="10dip"
		android:contentDescription="@string/lockscreen_transport_play_description"/>
		</FrameLayout>
		<FrameLayout
		android:layout_width="wrap_content"
		@@ -94,7 +96,8 @@
		android:clickable="true"
		android:src="@drawable/ic_media_ff"
		android:background="?android:attr/selectableItemBackground"
		android:padding="10dip"/>
		android:padding="10dip"
		android:contentDescription="@string/lockscreen_transport_next_description"/>
		</FrameLayout>
		</LinearLayout>
		</LinearLayout>

+12 −1

Original line number	Diff line number	Diff line
		@@ -1831,6 +1831,17 @@
		<string name="lockscreen_permanent_disabled_sim_instructions">Your SIM card is permanently disabled.\n
		Please contact your wireless service provider to obtain another SIM card.</string>

		<!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
		<string name="lockscreen_transport_prev_description">Previous track button</string>
		<!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
		<string name="lockscreen_transport_next_description">Next track button</string>
		<!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
		<string name="lockscreen_transport_pause_description">Pause button</string>
		<!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
		<string name="lockscreen_transport_play_description">Play button</string>
		<!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
		<string name="lockscreen_transport_stop_description">Stop button</string>

		<!-- Shown in the lock screen when there is emergency calls only mode. -->
		<string name="emergency_calls_only" msgid="2485604591272668370">Emergency calls only</string>