12 files changed, 52 insertions, 4 deletions
diff --git a/res/drawable-hdpi/ic_pausing_indicator.png b/res/drawable-hdpi/ic_pausing_indicator.png
new file mode 100644
index 000000000..b3e5cb797
--- /dev/null
+++ b/res/drawable-hdpi/ic_pausing_indicator.png
diff --git a/res/drawable-hdpi/video_continue.png b/res/drawable-hdpi/video_continue.png
new file mode 100644
index 000000000..901a2f048
--- /dev/null
+++ b/res/drawable-hdpi/video_continue.png
diff --git a/res/drawable-hdpi/video_pause.png b/res/drawable-hdpi/video_pause.png
new file mode 100644
index 000000000..c7880b781
--- /dev/null
+++ b/res/drawable-hdpi/video_pause.png
diff --git a/res/drawable-mdpi/ic_pausing_indicator.png b/res/drawable-mdpi/ic_pausing_indicator.png
new file mode 100644
index 000000000..4fe853c16
--- /dev/null
+++ b/res/drawable-mdpi/ic_pausing_indicator.png
diff --git a/res/drawable-mdpi/video_continue.png b/res/drawable-mdpi/video_continue.png
new file mode 100644
index 000000000..1342b59f1
--- /dev/null
+++ b/res/drawable-mdpi/video_continue.png
diff --git a/res/drawable-mdpi/video_pause.png b/res/drawable-mdpi/video_pause.png
new file mode 100644
index 000000000..2bc7e6c0c
--- /dev/null
+++ b/res/drawable-mdpi/video_pause.png
diff --git a/res/drawable-xhdpi/ic_pausing_indicator.png b/res/drawable-xhdpi/ic_pausing_indicator.png
new file mode 100644
index 000000000..24cb933b7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_pausing_indicator.png
diff --git a/res/drawable-xhdpi/video_continue.png b/res/drawable-xhdpi/video_continue.png
new file mode 100644
index 000000000..bf4b54e9d
--- /dev/null
+++ b/res/drawable-xhdpi/video_continue.png
diff --git a/res/drawable-xhdpi/video_pause.png b/res/drawable-xhdpi/video_pause.png
new file mode 100644
index 000000000..0317a226e
--- /dev/null
+++ b/res/drawable-xhdpi/video_pause.png
diff --git a/res/drawable/btn_pause_recording.xml b/res/drawable/btn_pause_recording.xml
new file mode 100644
index 000000000..61609cbcf
--- /dev/null
+++ b/res/drawable/btn_pause_recording.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions are
+     met:
+         * Redistributions of source code must retain the above copyright
+           notice, this list of conditions and the following disclaimer.
+         * Redistributions in binary form must reproduce the above
+           copyright notice, this list of conditions and the following
+           disclaimer in the documentation and/or other materials provided
+           with the distribution.
+         * Neither the name of The Linux Foundation nor the names of its
+           contributors may be used to endorse or promote products derived
+           from this software without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+     WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+     ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/video_continue" />
+    <item android:drawable="@drawable/video_pause" />
+</selector>
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 198be8913..af839e774 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -49,9 +49,24 @@
         android:id="@+id/render_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-    <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect"
-            style="@style/ViewfinderLabelLayout">
-        <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" />
+    <com.android.camera.ui.RotateLayout
+        android:id="@+id/recording_time_rect"
+         android:layout_height="match_parent"
+         android:layout_width="match_parent">
+            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:orientation="horizontal"
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent">
+                <com.android.camera.PauseButton android:id="@+id/video_pause"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:layout_marginLeft="50dp"
+                        android:padding="23dp"
+                        android:visibility="gone"
+                        android:src="@drawable/btn_pause_recording"/>
+                 <include layout="@layout/viewfinder_labels_video"
+                          android:id="@+id/labels" />
+            </LinearLayout>
     </com.android.camera.ui.RotateLayout>
     <ImageView android:id="@+id/review_image"
             android:layout_height="match_parent"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0d6241588..ad32b0634 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -112,7 +112,7 @@
         <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">10dp</item>
+        <item name="android:layout_marginTop">23dp</item>
         <item name="android:paddingLeft">15dp</item>
         <item name="android:paddingRight">15dp</item>
         <item name="android:paddingTop">3dp</item>