diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-11-26 16:33:56 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2010-11-30 14:17:18 +0800 |
| commit | aa10c5120854bb1306ff67f03dc19347ee350e98 (patch) | |
| tree | 5b653010936d2da18498c902e593c6bf2543a4c7 /res | |
| parent | 75f869a1b60707b7d132567dd5e7f61d050ef926 (diff) | |
| download | packages_apps_LegacyCamera-aa10c5120854bb1306ff67f03dc19347ee350e98.zip packages_apps_LegacyCamera-aa10c5120854bb1306ff67f03dc19347ee350e98.tar.gz packages_apps_LegacyCamera-aa10c5120854bb1306ff67f03dc19347ee350e98.tar.bz2 | |
Move the recording time indicator to preview frame.
Change-Id: I7df59eb25d5f1d251d35ca4d8cdf0ee52e1c2482
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-mdpi/ic_recording_indicator_small.png | bin | 0 -> 722 bytes | |||
| -rw-r--r-- | res/layout-xlarge/camera_control.xml | 11 | ||||
| -rw-r--r-- | res/layout-xlarge/preview_frame_video.xml | 11 | ||||
| -rw-r--r-- | res/values/styles.xml | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/res/drawable-mdpi/ic_recording_indicator_small.png b/res/drawable-mdpi/ic_recording_indicator_small.png Binary files differnew file mode 100644 index 0000000..9d168f1 --- /dev/null +++ b/res/drawable-mdpi/ic_recording_indicator_small.png diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml index a891e3c..bc6fd1f 100644 --- a/res/layout-xlarge/camera_control.xml +++ b/res/layout-xlarge/camera_control.xml @@ -36,17 +36,6 @@ android:layout_height="150dp" android:layout_marginRight="160dp"/> - <TextView android:id="@+id/recording_time" - style="@style/RecordingTime" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_marginTop="90dp" - android:drawablePadding="8dp" - android:drawableLeft="@drawable/ic_recording_indicator" - android:visibility="gone" /> - <TextView android:id="@+id/time_lapse_recording_time" style="@style/RecordingTime" android:layout_width="wrap_content" diff --git a/res/layout-xlarge/preview_frame_video.xml b/res/layout-xlarge/preview_frame_video.xml index 0996799..6a4ace1 100644 --- a/res/layout-xlarge/preview_frame_video.xml +++ b/res/layout-xlarge/preview_frame_video.xml @@ -36,6 +36,17 @@ android:layout_height="match_parent" android:visibility="gone" /> <include layout="@layout/review_thumbnail"/> + <TextView android:id="@+id/recording_time" + style="@style/RecordingTime" + android:layout_marginTop="20dp" + android:layout_marginRight="26dp" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:paddingLeft="8dp" + android:gravity="center" + android:background="@drawable/mode_switch_bg_v2" + android:drawableLeft="@drawable/ic_recording_indicator_small" + android:visibility="gone"/> </RelativeLayout> <include layout="@layout/camera_picker"/> </com.android.camera.PreviewFrameLayout> diff --git a/res/values/styles.xml b/res/values/styles.xml index 5244d05..0fa707b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -61,14 +61,14 @@ <item name="android:layout_width">match_parent</item> </style> <style name="RecordingTime"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> + <item name="android:layout_width">100dp</item> + <item name="android:layout_height">26dp</item> <item name="android:shadowColor">#c0000000</item> <item name="android:shadowDx">1</item> <item name="android:shadowDy">1</item> <item name="android:shadowRadius">1</item> <item name="android:textColor">@color/recording_time_elapsed_text</item> - <item name="android:textSize">23dp</item> + <item name="android:textSize">16dp</item> <item name="android:textStyle">bold</item> </style> <style name="SettingPickerText"> |
