diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-10-01 18:11:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-01 18:11:19 -0700 |
| commit | 607bb9a208578dc7e0aa79c4dd222e3edd26566b (patch) | |
| tree | d5ecd43616eb1504622f51b9ec101c81e5c820e2 /res | |
| parent | 852853c8ac10aeea3f8df0ec53d8f2ae203e0a5e (diff) | |
| parent | 72a83bc295dfa5c0d07102065f50930bf18e28e2 (diff) | |
| download | android_packages_apps_Snap-607bb9a208578dc7e0aa79c4dd222e3edd26566b.tar.gz android_packages_apps_Snap-607bb9a208578dc7e0aa79c4dd222e3edd26566b.tar.bz2 android_packages_apps_Snap-607bb9a208578dc7e0aa79c4dd222e3edd26566b.zip | |
am 72a83bc2: Merge "Add content description to post-capture thumbnail." into gb-ub-photos-carlsbad
* commit '72a83bc295dfa5c0d07102065f50930bf18e28e2':
Add content description to post-capture thumbnail.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/camera_controls.xml | 3 | ||||
| -rw-r--r-- | res/layout-port/camera_controls.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml index 14953320e..cf27af192 100644 --- a/res/layout-land/camera_controls.xml +++ b/res/layout-land/camera_controls.xml @@ -65,6 +65,7 @@ android:layout_width="@dimen/capture_size" android:layout_height="@dimen/capture_size" android:scaleType="centerInside" - android:layout_gravity="top|right" /> + android:layout_gravity="top|right" + android:contentDescription="@string/switch_photo_filmstrip" /> </com.android.camera.ui.CameraControls> diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index 03e896bc0..a98ddff25 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -65,6 +65,7 @@ android:layout_width="@dimen/capture_size" android:layout_height="@dimen/capture_size" android:scaleType="centerInside" - android:layout_gravity="top|right" /> + android:layout_gravity="top|right" + android:contentDescription="@string/switch_photo_filmstrip" /> </com.android.camera.ui.CameraControls> diff --git a/res/values/strings.xml b/res/values/strings.xml index 2d8684850..7a71a8e77 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -657,4 +657,7 @@ CHAR LIMIT = NONE] --> <!-- Label for the save button in the crop activity action bar [CHAR LIMIT=20] --> <string name="crop_save">Save</string> + <!-- Label for album filmstrip button --> + <string name="switch_photo_filmstrip">Filmstrip view</string> + </resources> |