summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-04-16 13:52:07 -0700
committerztenghui <ztenghui@google.com>2013-04-17 11:05:50 -0700
commit1b4d875d0434b226182dd37c4756ac468a660b94 (patch)
tree1c2c85b8e6b11c59a487726f883aaea5a8cdb193 /src
parentbff393cee9eb2fc5d3a89fbcebb2fea988ab4cb2 (diff)
downloadandroid_packages_apps_Snap-1b4d875d0434b226182dd37c4756ac468a660b94.tar.gz
android_packages_apps_Snap-1b4d875d0434b226182dd37c4756ac468a660b94.tar.bz2
android_packages_apps_Snap-1b4d875d0434b226182dd37c4756ac468a660b94.zip
Add accessibility to video player controller.
bug:5714277 cherry pick the Carlsbad CL: https://googleplex-android-review.git.corp.google.com/#/c/297944/ Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/CommonControllerOverlay.java23
1 files changed, 18 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/app/CommonControllerOverlay.java b/src/com/android/gallery3d/app/CommonControllerOverlay.java
index a5aa805ef..a4f5807ae 100644
--- a/src/com/android/gallery3d/app/CommonControllerOverlay.java
+++ b/src/com/android/gallery3d/app/CommonControllerOverlay.java
@@ -17,6 +17,7 @@
package com.android.gallery3d.app;
import android.content.Context;
+import android.content.res.Resources;
import android.graphics.Rect;
import android.view.Gravity;
import android.view.KeyEvent;
@@ -83,7 +84,8 @@ public abstract class CommonControllerOverlay extends FrameLayout implements
// multiple ones for trimming.
createTimeBar(context);
addView(mTimeBar, wrapContent);
-
+ mTimeBar.setContentDescription(
+ context.getResources().getString(R.string.accessibility_time_bar));
mLoadingView = new LinearLayout(context);
mLoadingView.setOrientation(LinearLayout.VERTICAL);
mLoadingView.setGravity(Gravity.CENTER_HORIZONTAL);
@@ -97,6 +99,8 @@ public abstract class CommonControllerOverlay extends FrameLayout implements
mPlayPauseReplayView = new ImageView(context);
mPlayPauseReplayView.setImageResource(R.drawable.ic_vidcontrol_play);
+ mPlayPauseReplayView.setContentDescription(
+ context.getResources().getString(R.string.accessibility_play_video));
mPlayPauseReplayView.setBackgroundResource(R.drawable.bg_vidcontrol);
mPlayPauseReplayView.setScaleType(ScaleType.CENTER);
mPlayPauseReplayView.setFocusable(true);
@@ -299,10 +303,19 @@ public abstract class CommonControllerOverlay extends FrameLayout implements
protected void updateViews() {
mBackground.setVisibility(View.VISIBLE);
mTimeBar.setVisibility(View.VISIBLE);
- mPlayPauseReplayView.setImageResource(
- mState == State.PAUSED ? R.drawable.ic_vidcontrol_play :
- mState == State.PLAYING ? R.drawable.ic_vidcontrol_pause :
- R.drawable.ic_vidcontrol_reload);
+ Resources resources = getContext().getResources();
+ int imageResource = R.drawable.ic_vidcontrol_reload;
+ String contentDescription = resources.getString(R.string.accessibility_reload_video);
+ if (mState == State.PAUSED) {
+ imageResource = R.drawable.ic_vidcontrol_play;
+ contentDescription = resources.getString(R.string.accessibility_play_video);
+ } else if (mState == State.PLAYING) {
+ imageResource = R.drawable.ic_vidcontrol_pause;
+ contentDescription = resources.getString(R.string.accessibility_pause_video);
+ }
+
+ mPlayPauseReplayView.setImageResource(imageResource);
+ mPlayPauseReplayView.setContentDescription(contentDescription);
mPlayPauseReplayView.setVisibility(
(mState != State.LOADING && mState != State.ERROR &&
!(mState == State.ENDED && !mCanReplay))