diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-12-13 19:38:38 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-12-14 14:42:57 +0800 |
| commit | ae300166c0273139d5e5c45fb745347950761b47 (patch) | |
| tree | aa7c23e3766a9394c16028378fdb18950f16f996 | |
| parent | dd6d702e0cdf6f5dc8a7fd478a853e2e0eb85a60 (diff) | |
| download | LegacyCamera-ae300166c0273139d5e5c45fb745347950761b47.zip LegacyCamera-ae300166c0273139d5e5c45fb745347950761b47.tar.gz LegacyCamera-ae300166c0273139d5e5c45fb745347950761b47.tar.bz2 | |
Some changes about time lapse recording label.
1. Move time lapse recording label from bottom to top.
2. Change the string from "Time Lapse" to "Time lapse recording".
3. Increase the padding between the red recording indicator and the
recording time.
bug:3278546
Change-Id: Ifaca285f398fb4b1c81e5dd32315379add73e2a6
| -rw-r--r-- | res/layout-xlarge/camera_control.xml | 9 | ||||
| -rw-r--r-- | res/layout-xlarge/preview_frame_video.xml | 12 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 3 |
4 files changed, 10 insertions, 16 deletions
diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml index 9f68763..c078e13 100644 --- a/res/layout-xlarge/camera_control.xml +++ b/res/layout-xlarge/camera_control.xml @@ -34,15 +34,6 @@ android:layout_marginTop="20dp" android:layout_marginRight="23dp"/> - <TextView android:id="@+id/time_lapse_recording_time" - style="@style/RecordingTime" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_marginTop="40dp" - android:visibility="gone" /> - <com.android.camera.ui.IndicatorWheel android:id="@+id/indicator_wheel" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout-xlarge/preview_frame_video.xml b/res/layout-xlarge/preview_frame_video.xml index 7649896..0311481 100644 --- a/res/layout-xlarge/preview_frame_video.xml +++ b/res/layout-xlarge/preview_frame_video.xml @@ -42,6 +42,13 @@ android:layout_alignParentRight="true" android:gravity="center" android:drawableLeft="@drawable/ic_recording_indicator_small" + android:drawablePadding="5dp" + android:visibility="gone"/> + <TextView android:id="@+id/time_lapse_label" + android:text="@string/time_lapse_title" + style="@style/OnViewfinderLabel" + android:layout_toLeftOf="@+id/recording_time" + android:layout_alignWithParentIfMissing="true" android:visibility="gone"/> <include layout="@layout/review_control"/> <LinearLayout @@ -56,10 +63,5 @@ android:paddingBottom="10dp" android:src="@drawable/btn_ic_review_play"/> </LinearLayout> - <TextView android:id="@+id/time_lapse_label" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:text="@string/time_lapse_title" - style="@style/OnViewfinderLabel"/> </RelativeLayout> </com.android.camera.PreviewFrameLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 8102bc3..92bc3ee 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -123,7 +123,7 @@ <string name="disable_time_lapse_mode">Disable Time Lapse</string> <!-- A lable that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] --> - <string name="time_lapse_title">Time Lapse</string> + <string name="time_lapse_title">Time lapse recording</string> <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] --> <string name="pref_camera_id_title">Select camera</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index ef7d199..d31938b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -95,7 +95,8 @@ <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> <item name="android:singleLine">true</item> - <item name="android:layout_margin">20dp</item> + <item name="android:layout_marginRight">20dp</item> + <item name="android:layout_marginTop">20dp</item> <item name="android:paddingLeft">15dp</item> <item name="android:paddingRight">15dp</item> <item name="android:paddingTop">3dp</item> |