diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-23 22:53:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-23 22:53:56 -0700 |
| commit | d4186ee0bf3bf358e87ab5ca6f80e3e2d990821f (patch) | |
| tree | ecd84381f0c8ccaef5da2fd91b71aff9be0e44fe /res/layout | |
| parent | 72f6518f8a47b20d9cf0896b1c156c159247d148 (diff) | |
| parent | 006ba35a6ab7dcfa7ca7589dfb485b227f58e072 (diff) | |
| download | LegacyCamera-d4186ee0bf3bf358e87ab5ca6f80e3e2d990821f.zip LegacyCamera-d4186ee0bf3bf358e87ab5ca6f80e3e2d990821f.tar.gz LegacyCamera-d4186ee0bf3bf358e87ab5ca6f80e3e2d990821f.tar.bz2 | |
Merge changes 5118,5126 into donut
* changes:
Change the text on the ok button in attach mode from "attach" to "OK", according to the UI refinement proposed by Jeff.
Create new strings for review mode buttons and restore the original values to lowercase since they are used in other places.
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/attach_camera_control.xml | 10 | ||||
| -rw-r--r-- | res/layout/review_control.xml | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml index 8cbbf98..07af8c6 100644 --- a/res/layout/attach_camera_control.xml +++ b/res/layout/attach_camera_control.xml @@ -44,7 +44,7 @@ <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:textSize="12sp" - android:text="@string/camera_cancel" /> + android:text="@string/review_cancel" /> </LinearLayout> <LinearLayout android:orientation="vertical" @@ -64,7 +64,7 @@ <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:textSize="12sp" - android:text="@string/camera_retake" /> + android:text="@string/review_retake" /> </LinearLayout> <LinearLayout android:orientation="vertical" @@ -84,7 +84,7 @@ <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:textSize="12sp" - android:text="@string/camera_play" /> + android:text="@string/review_play" /> </LinearLayout> </LinearLayout> @@ -112,12 +112,12 @@ android:scaleType="center" android:clickable="true" android:focusable="true" - android:src="@drawable/btn_ic_review_attach" + android:src="@drawable/btn_ic_review_done" android:background="@drawable/btn_camera_review"/> <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:textSize="12sp" - android:text="@string/camera_attach" /> + android:text="@string/review_ok" /> </LinearLayout> </RelativeLayout> diff --git a/res/layout/review_control.xml b/res/layout/review_control.xml index aa44dd7..404e651 100644 --- a/res/layout/review_control.xml +++ b/res/layout/review_control.xml @@ -44,7 +44,7 @@ <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:textSize="12sp" - android:text="@string/camera_toss" /> + android:text="@string/review_toss" /> </LinearLayout> <LinearLayout android:orientation="vertical" android:gravity="top|center_horizontal" @@ -62,7 +62,7 @@ <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:textSize="12sp" - android:text="@string/camera_share" /> + android:text="@string/review_share" /> </LinearLayout> <LinearLayout android:orientation="vertical" android:gravity="top|center_horizontal" @@ -80,7 +80,7 @@ <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:textSize="12sp" - android:text="@string/camera_play" /> + android:text="@string/review_play" /> </LinearLayout> <LinearLayout android:orientation="vertical" android:gravity="top|center_horizontal" @@ -98,7 +98,7 @@ <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:textSize="12sp" - android:text="@string/camera_set" /> + android:text="@string/review_set" /> </LinearLayout> <LinearLayout android:orientation="vertical" android:gravity="top|center_horizontal" @@ -116,7 +116,7 @@ android:layout_width="wrap_content" android:textStyle="bold" android:textSize="12sp" - android:text="@string/camera_done" /> + android:text="@string/review_done" /> </LinearLayout> </LinearLayout> </RelativeLayout> |