summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-02-03 17:52:18 -0800
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-05-26 09:48:53 -0700
commitccd3e81c382dd72761ebf3947599c94f8fe0def2 (patch)
tree46280e2b07619531d198484ec3b54a54b4e3a1dd /res
parent02fa4483a6536b19ee49a5f98d30a3fa03eae72d (diff)
downloadandroid_packages_apps_Snap-ccd3e81c382dd72761ebf3947599c94f8fe0def2.tar.gz
android_packages_apps_Snap-ccd3e81c382dd72761ebf3947599c94f8fe0def2.tar.bz2
android_packages_apps_Snap-ccd3e81c382dd72761ebf3947599c94f8fe0def2.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
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/qcomstrings.xml2
3 files changed, 5 insertions, 5 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 520caaecd..97db03af2 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="50dp"
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/qcomstrings.xml b/res/values/qcomstrings.xml
index 0ddd89aa8..723bdffc8 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -495,6 +495,8 @@
<!-- Toast after 2k4k video is enabled to inform SeeMore has been disabled -->
<string name="video_quality_4k_disable_SeeMore">SeeMore cannot be enabled during 4k video</string>
+ <string name="initial_recording_seconds" translatable="false">00:00</string>
+
<!-- TODO: Remove these? -->
<string name="pref_camera_redeyereduction_entry_disable" translatable="false">disable</string>