summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-02-03 17:52:18 -0800
committerCamera Software Integration <camswint@localhost>2016-02-06 22:25:33 +0530
commit829ca6c97c928a8a9ed83119d3a5ca2e19642b36 (patch)
tree0da65859122b902bf7a8bd42cba36d1961e5c949 /res
parent744dfe88ca7207957790146eeb17899c140febcf (diff)
downloadandroid_packages_apps_Snap-829ca6c97c928a8a9ed83119d3a5ca2e19642b36.tar.gz
android_packages_apps_Snap-829ca6c97c928a8a9ed83119d3a5ca2e19642b36.tar.bz2
android_packages_apps_Snap-829ca6c97c928a8a9ed83119d3a5ca2e19642b36.zip
SnapdragonCamera: Recording screen to be dynamic
Let the recording rotate layout to be removed by default and added when it's needed. Change-Id: I2b910897956b914c150941276b299160e9147055 CRs-Fixed: 958510
Diffstat (limited to 'res')
-rw-r--r--res/layout/video_module.xml1
-rw-r--r--res/layout/viewfinder_labels_video.xml7
-rw-r--r--res/values/strings.xml1
3 files changed, 4 insertions, 5 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index fa01a6c85..54ba72ebe 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -64,7 +64,6 @@
android:layout_width="wrap_content"
android:layout_marginLeft="70dp"
android:padding="23dp"
- android:visibility="gone"
android:src="@drawable/btn_pause_recording"/>
<include layout="@layout/viewfinder_labels_video"
android:id="@+id/labels" />
diff --git a/res/layout/viewfinder_labels_video.xml b/res/layout/viewfinder_labels_video.xml
index cfe3b0211..36ea6abe8 100644
--- a/res/layout/viewfinder_labels_video.xml
+++ b/res/layout/viewfinder_labels_video.xml
@@ -21,11 +21,10 @@
<TextView android:id="@+id/recording_time"
style="@style/OnViewfinderLabel"
android:gravity="center"
+ android:text="@string/initial_recording_seconds"
android:drawableLeft="@drawable/ic_recording_indicator"
- android:drawablePadding="5dp"
- android:visibility="gone" />
+ android:drawablePadding="5dp"/>
<TextView android:id="@+id/time_lapse_label"
android:text="@string/time_lapse_title"
- style="@style/OnViewfinderLabel"
- android:visibility="gone" />
+ style="@style/OnViewfinderLabel"/>
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a676d9c53..8869a72a8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -736,4 +736,5 @@ CHAR LIMIT = NONE] -->
<string name="pref_camera_video_rotation_label_270">270</string>
<string name="remaining_photos_format">%d left</string>
+ <string name="initial_recording_seconds">00:00</string>
</resources>