From aa10c5120854bb1306ff67f03dc19347ee350e98 Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Fri, 26 Nov 2010 16:33:56 +0800
Subject: Move the recording time indicator to preview frame.

Change-Id: I7df59eb25d5f1d251d35ca4d8cdf0ee52e1c2482
---
 res/drawable-mdpi/ic_recording_indicator_small.png | Bin 0 -> 722 bytes
 res/layout-xlarge/camera_control.xml               |  11 -----------
 res/layout-xlarge/preview_frame_video.xml          |  11 +++++++++++
 res/values/styles.xml                              |   6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 res/drawable-mdpi/ic_recording_indicator_small.png

diff --git a/res/drawable-mdpi/ic_recording_indicator_small.png b/res/drawable-mdpi/ic_recording_indicator_small.png
new file mode 100644
index 0000000..9d168f1
Binary files /dev/null and b/res/drawable-mdpi/ic_recording_indicator_small.png differ
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">
-- 
cgit v1.1