diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/capture_module.xml | 4 | ||||
| -rw-r--r-- | res/layout/video_module.xml | 3 | ||||
| -rw-r--r-- | res/values/qcomarrays.xml | 10 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 15 | ||||
| -rw-r--r-- | res/xml/camera_preferences.xml | 18 |
5 files changed, 39 insertions, 11 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 02c32acab..a68af5e08 100644 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -33,12 +33,12 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical|center_horizontal"> - <SurfaceView + <com.android.camera.ui.AutoFitSurfaceView android:id="@+id/mdp_preview_content" android:layout_width="match_parent" android:layout_height="match_parent" /> - <SurfaceView + <com.android.camera.ui.AutoFitSurfaceView android:id="@+id/mdp_preview_content2" android:layout_width="300dp" android:layout_height="300dp" /> diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index c1063510b..20d7be1d2 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -42,8 +42,7 @@ android:id="@+id/preview_cover" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/black" - android:visibility="gone" /> + android:background="@android:color/black" /> <View android:id="@+id/flash_overlay" android:layout_width="match_parent" diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 40c8b8a77..d3218bdaf 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -873,5 +873,15 @@ <item>@string/pref_camera_mono_preview_value_on</item> <item>@string/pref_camera_mono_preview_value_off</item> </string-array> + + <string-array name="pref_camera_clearsight_entries" translatable="true"> + <item>@string/pref_camera_clearsight_entry_on</item> + <item>@string/pref_camera_clearsight_entry_off</item> + </string-array> + + <string-array name="pref_camera_clearsight_entryvalues" translatable="false"> + <item>@string/pref_camera_clearsight_value_on</item> + <item>@string/pref_camera_clearsight_value_off</item> + </string-array> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 888000c36..ea90cf72a 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -277,7 +277,7 @@ <string name="pref_camera_cds_default" translatable="false">on</string> <!-- Default video cds mode setting--> - <string name="pref_camera_video_cds_default" translatable="false">on</string> + <string name="pref_camera_video_cds_default" translatable="false">off</string> <!-- Settings menu, setting title text for tnr mode--> <string name="pref_camera_tnr_title">TNR mode</string> @@ -289,7 +289,7 @@ <string name="pref_camera_tnr_default" translatable="false">off</string> <!-- Default video tnr mode setting--> - <string name="pref_camera_video_tnr_default" translatable="false">off</string> + <string name="pref_camera_video_tnr_default" translatable="false">on</string> <!-- Default face detection setting. --> <string name="pref_camera_facedetection_default" translatable="false">off</string> @@ -970,5 +970,16 @@ <string name="pref_camera_mono_preview_value_on">on</string> <string name="pref_camera_mono_preview_value_off">off</string> + + <string name="pref_camera_clearsight_title">ClearSight</string> + <string name="pref_camera_clearsight_default" translatable="false">off</string> + <string name="pref_camera_clearsight_entry_on">On</string> + <string name="pref_camera_clearsight_entry_off">Off</string> + + <string name="pref_camera_clearsight_value_on" translatable="false">on</string> + <string name="pref_camera_clearsight_value_off" translatable="false">off</string> + + <string name="clearsight_capture_success">ClearSight capture successful</string> + <string name="clearsight_capture_fail">ClearSight capture failed</string> </resources> diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 86eb36f71..5fafb855b 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -381,9 +381,17 @@ camera:entryValues="@array/pref_camera_dual_camera_entryvalues" /> <ListPreference - camera:key="pref_camera_mono_preview_key" - camera:defaultValue="@string/pref_camera_mono_preview_default" - camera:title="@string/pref_camera_mono_preview_title" - camera:entries="@array/pref_camera_mono_preview_entries" - camera:entryValues="@array/pref_camera_mono_preview_entryvalues" /> + camera:defaultValue="@string/pref_camera_mono_preview_default" + camera:entries="@array/pref_camera_mono_preview_entries" + camera:entryValues="@array/pref_camera_mono_preview_entryvalues" + camera:key="pref_camera_mono_preview_key" + camera:title="@string/pref_camera_mono_preview_title" /> + + <ListPreference + camera:defaultValue="@string/pref_camera_clearsight_default" + camera:entries="@array/pref_camera_clearsight_entries" + camera:entryValues="@array/pref_camera_clearsight_entryvalues" + camera:key="pref_camera_clearsight_key" + camera:title="@string/pref_camera_clearsight_title" /> + </PreferenceGroup> |