diff options
| -rwxr-xr-x | res/values/camera2arrays.xml | 11 | ||||
| -rwxr-xr-x | res/values/qcomstrings.xml | 8 | ||||
| -rwxr-xr-x | res/xml/capture_preferences.xml | 7 | ||||
| -rwxr-xr-x | res/xml/setting_menu_preferences.xml | 9 | ||||
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 14 | ||||
| -rwxr-xr-x | src/com/android/camera/SettingsManager.java | 1 |
6 files changed, 7 insertions, 43 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index 2adf10e38..0c07ed743 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -1181,16 +1181,6 @@ for time lapse recording --> <item>@string/pref_camera2_deepportrait_entry_value_enable</item> </string-array> - <string-array name="pref_camera2_earlypcr_entryvalues" translatable="false"> - <item>@string/pref_camera2_earlypcr_entry_value_disable</item> - <item>@string/pref_camera2_earlypcr_entry_value_enable</item> - </string-array> - - <string-array name="pref_camera2_earlypcr_entries" translatable="false"> - <item>@string/pref_camera2_earlypcr_entry_disable</item> - <item>@string/pref_camera2_earlypcr_entry_enable</item> - </string-array> - <string-array name="pref_camera2_stats_visualizer_entries" translatable="false"> <item>@string/pref_camera2_stats_visualizer_entry_disable</item> <item>@string/pref_camera2_stats_visualizer_entry_bg_stats</item> @@ -1204,4 +1194,5 @@ for time lapse recording --> <item>@string/pref_camera2_stats_visualizer_entry_value_enable_be</item> <item>@string/pref_camera2_stats_visualizer_entry_value_enable_hist</item> </string-array> + </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 28c4f48a2..ff8bc9728 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1260,13 +1260,6 @@ <string name="pref_camera2_deepportrait_entry_value_enable" translatable="false">on</string> <string name="pref_camera_scenemode_entry_deepportrait" translatable="false">Deepportrait</string> - <string name="pref_camera2_earlypcr_title" translatable="false">Early PCR</string> - <string name="pref_camera2_earlypcr_default" translatable="false">disable</string> - <string name="pref_camera2_earlypcr_entry_enable" translatable="false">enable</string> - <string name="pref_camera2_earlypcr_entry_disable" translatable="false">disable</string> - <string name="pref_camera2_earlypcr_entry_value_enable" translatable="false">enable</string> - <string name="pref_camera2_earlypcr_entry_value_disable" translatable="false">disable</string> - <string name="pref_camera2_stats_visualizer_title" translatable="true">Stats Visualizer</string> <string name="pref_camera2_stats_visualizer_default" translatable="false">0</string> <string name="pref_camera2_stats_visualizer_entry_disable" translatable="false">Disable All</string> @@ -1277,5 +1270,6 @@ <string name="pref_camera2_stats_visualizer_entry_value_enable_bg" translatable="false">1</string> <string name="pref_camera2_stats_visualizer_entry_value_enable_be" translatable="false">2</string> <string name="pref_camera2_stats_visualizer_entry_value_enable_hist" translatable="false">3</string> + </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 00c9244b4..af724b536 100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -434,15 +434,10 @@ camera:entryValues="@array/pref_camera2_video_hdr_entryvalues" /> <ListPreference - camera:key="pref_camera2_earlypcr_key" - camera:defaultValue="@string/pref_camera2_earlypcr_default" - camera:title="@string/pref_camera2_earlypcr_title" - camera:entries="@array/pref_camera2_earlypcr_entries" - camera:entryValues="@array/pref_camera2_earlypcr_entryvalues" /> - <ListPreference camera:key="pref_camera2_stats_visualizer_key" camera:defaultValue="@string/pref_camera2_stats_visualizer_default" camera:title="@string/pref_camera2_stats_visualizer_title" camera:entries="@array/pref_camera2_stats_visualizer_entries" camera:entryValues="@array/pref_camera2_stats_visualizer_entryvalues" /> + </PreferenceGroup> diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index 79daf7e8c..bae2c4ba1 100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -447,15 +447,6 @@ android:summary="%s"/> <ListPreference - android:key="pref_camera2_earlypcr_key" - android:defaultValue="@string/pref_camera2_earlypcr_default" - android:title="@string/pref_camera2_earlypcr_title" - android:entries="@array/pref_camera2_earlypcr_entries" - android:entryValues="@array/pref_camera2_earlypcr_entryvalues" - android:layout="@layout/preference" - android:summary="%s"/> - - <ListPreference android:key="pref_camera2_stats_visualizer_key" android:defaultValue="@string/pref_camera2_stats_visualizer_default" android:title="@string/pref_camera2_stats_visualizer_title" diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 34686e58f..9598a2fb1 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -5073,16 +5073,10 @@ public class CaptureModule implements CameraModule, PhotoController, } private void applyEarlyPCR(CaptureRequest.Builder request) { - if (!mSettingsManager.isDeveloperEnabled()) { - return; - } - String value = mSettingsManager.getValue(SettingsManager.KEY_EARLY_PCR_VALUE); - if(value != null) { - try { - request.set(CaptureModule.earlyPCR, (byte) (value.equals("disable") ? 0x00 : 0x01)); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } + try { + request.set(CaptureModule.earlyPCR, (byte) (mHighSpeedCapture ? 0x00 : 0x01)); + } catch (IllegalArgumentException e) { + e.printStackTrace(); } } diff --git a/src/com/android/camera/SettingsManager.java b/src/com/android/camera/SettingsManager.java index f8def573b..87bd3ae78 100755 --- a/src/com/android/camera/SettingsManager.java +++ b/src/com/android/camera/SettingsManager.java @@ -164,7 +164,6 @@ public class SettingsManager implements ListMenu.SettingsListener { public static final String KEY_EIS_VALUE = "pref_camera2_eis_key"; public static final String KEY_FOVC_VALUE = "pref_camera2_fovc_key"; public static final String KEY_DEEPPORTRAIT_VALUE = "pref_camera2_deepportrait_key"; - public static final String KEY_EARLY_PCR_VALUE = "pref_camera2_earlypcr_key"; public static final String KEY_AWB_RAGIN_VALUE = "pref_camera2_awb_cct_rgain_key"; public static final String KEY_AWB_GAGIN_VALUE = "pref_camera2_awb_cct_ggain_key"; public static final String KEY_AWB_BAGIN_VALUE = "pref_camera2_awb_cct_bgain_key"; |