diff options
Diffstat (limited to 'res')
| -rwxr-xr-x | res/layout/capture_module.xml | 8 | ||||
| -rwxr-xr-x | res/values/qcomarrays.xml | 2 | ||||
| -rwxr-xr-x | res/values/qcomstrings.xml | 2 | ||||
| -rwxr-xr-x | res/xml/capture_preferences.xml | 1 |
4 files changed, 9 insertions, 4 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 17f14069f..1c012c5c7 100755 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -91,15 +91,15 @@ <com.android.camera.Camera2BGBitMap android:id="@+id/bg_stats_graph" android:visibility="gone" - android:layout_width="120dip" - android:layout_height="160dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginTop="68dip" android:layout_marginLeft="16dip" /> <com.android.camera.Camera2BEBitMap android:id="@+id/be_stats_graph" android:visibility="gone" - android:layout_width="120dip" - android:layout_height="160dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginTop="68dip" android:layout_marginLeft="16dip" /> <com.android.camera.DrawAutoHDR2 diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 13583406b..379794ef8 100755 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -630,6 +630,7 @@ <item>@string/pref_camera_manual_exp_entry_ISO_priority</item> <item>@string/pref_camera_manual_exp_entry_exptime_priority</item> <item>@string/pref_camera_manual_exp_entry_user_setting</item> + <item>@string/pref_camera_manual_exp_entry_gains_priority</item> <item>@string/pref_camera_manual_exp_entry_off</item> </string-array> @@ -637,6 +638,7 @@ <item>@string/pref_camera_manual_exp_value_ISO_priority</item> <item>@string/pref_camera_manual_exp_value_exptime_priority</item> <item>@string/pref_camera_manual_exp_value_user_setting</item> + <item>@string/pref_camera_manual_exp_value_gains_priority</item> <item>@string/pref_camera_manual_exp_value_off</item> </string-array> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 280d421cf..8d12e70f6 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -170,12 +170,14 @@ <string name="pref_camera_manual_exp_entry_ISO_priority">ISO priority</string> <string name="pref_camera_manual_exp_entry_exptime_priority">Exposure time priority</string> <string name="pref_camera_manual_exp_entry_user_setting">User setting</string> + <string name="pref_camera_manual_exp_entry_gains_priority">Gains priority</string> <string name="pref_camera_manual_exp_entry_off">Off</string> <string name="pref_camera_manual_exp_default">off</string> <string name="pref_camera_manual_exp_value_ISO_priority">iso-priority</string> <string name="pref_camera_manual_exp_value_exptime_priority">exp-time-priority</string> <string name="pref_camera_manual_exp_value_user_setting">user-setting</string> + <string name="pref_camera_manual_exp_value_gains_priority">gains-priority</string> <string name="pref_camera_manual_exp_value_off">off</string> <!-- Manual white balance entry values --> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index a3b47cbfa..bc74e280b 100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -149,6 +149,7 @@ camera:title="@string/pref_camera_id_title"/> <IconListPreference + camera:defaultValue="@string/pref_camera2_picturesize_default" camera:entries="@array/pref_camera2_picturesize_entries" camera:entryValues="@array/pref_camera2_picturesize_entryvalues" camera:key="pref_camera2_picturesize_key" |