summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/video_module.xml4
-rw-r--r--res/values/qcomarrays.xml6
-rw-r--r--res/values/qcomstrings.xml6
-rw-r--r--res/values/styles.xml2
4 files changed, 11 insertions, 7 deletions
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 20d7be1d2..2456caf82 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -70,8 +70,8 @@
<com.android.camera.PauseButton android:id="@+id/video_pause"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_marginLeft="70dp"
- android:padding="23dp"
+ android:layout_marginLeft="50dp"
+ android:padding="38dp"
android:src="@drawable/btn_pause_recording"/>
<include layout="@layout/viewfinder_labels_video"
android:id="@+id/labels" />
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index c4c7be482..7574992b9 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -833,12 +833,14 @@
</string-array>
<string-array name="pref_camera_instant_capture_entries" translatable="true">
- <item>@string/pref_camera_instant_capture_entry_enable</item>
+ <item>@string/pref_camera_instant_capture_entry_aggressive_aec</item>
+ <item>@string/pref_camera_instant_capture_entry_fast_aec</item>
<item>@string/pref_camera_instant_capture_entry_disable</item>
</string-array>
<string-array name="pref_camera_instant_capture_entry_values" translatable="false">
- <item>@string/pref_camera_instant_capture_value_enable</item>
+ <item>@string/pref_camera_instant_capture_value_aggressive_aec</item>
+ <item>@string/pref_camera_instant_capture_value_fast_aec</item>
<item>@string/pref_camera_instant_capture_value_disable</item>
</string-array>
</resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 31ba4d49f..a808ba354 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -202,12 +202,14 @@
<!-- Instant Capture entry -->
<string name="pref_camera_instant_capture_title" translatable="true">Instant Capture</string>
- <string name="pref_camera_instant_capture_entry_enable" translatable="true">Enable</string>
+ <string name="pref_camera_instant_capture_entry_aggressive_aec" translatable="true">Aggressive AEC</string>
+ <string name="pref_camera_instant_capture_entry_fast_aec" translatable="true">Fast AEC</string>
<string name="pref_camera_instant_capture_entry_disable" translatable="true">Disable</string>
<!-- Instant Capture entry values -->
<string name="pref_camera_instant_capture_default" translatable="false">0</string>
- <string name="pref_camera_instant_capture_value_enable" translatable="false">1</string>
+ <string name="pref_camera_instant_capture_value_aggressive_aec" translatable="false">1</string>
+ <string name="pref_camera_instant_capture_value_fast_aec" translatable="false">2</string>
<string name="pref_camera_instant_capture_value_disable" translatable="false">0</string>
<!-- Settings screen, ZSL location dialog choices -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bb13cc5c8..4a7284874 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -129,7 +129,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_marginTop">23dp</item>
+ <item name="android:layout_marginTop">38dp</item>
<item name="android:paddingLeft">15dp</item>
<item name="android:paddingRight">15dp</item>
<item name="android:paddingTop">3dp</item>