diff options
| author | ztenghui <ztenghui@google.com> | 2013-04-16 22:47:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-16 22:47:02 +0000 |
| commit | 235f32be550c9e7de2383b3dd699a13dd264b640 (patch) | |
| tree | 66873e5520c487c3ae70da5a69e2288a4a6a3438 /src/com | |
| parent | 6a6eb29944dd52140f3c458d5584780fa872a49b (diff) | |
| parent | 0b227127bbaa279bb02046e75e4b53d4a68866c8 (diff) | |
| download | android_packages_apps_Snap-235f32be550c9e7de2383b3dd699a13dd264b640.tar.gz android_packages_apps_Snap-235f32be550c9e7de2383b3dd699a13dd264b640.tar.bz2 android_packages_apps_Snap-235f32be550c9e7de2383b3dd699a13dd264b640.zip | |
Merge "Add accessibility to video player controller." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/app/CommonControllerOverlay.java | 23 |
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)) |