diff options
| author | xianming wang <mingwax@codeaurora.org> | 2018-11-14 14:37:57 +0800 |
|---|---|---|
| committer | xianming wang <mingwax@codeaurora.org> | 2018-11-14 14:40:58 +0800 |
| commit | 467c237e0694853a833b52fa8d17bc5a43398e16 (patch) | |
| tree | 0d52ea29297353fe21aa0e59641310d7b06584a8 /res | |
| parent | 78b730055695188e43819ddf108b63021c9d7d7c (diff) | |
| download | android_packages_apps_Snap-467c237e0694853a833b52fa8d17bc5a43398e16.tar.gz android_packages_apps_Snap-467c237e0694853a833b52fa8d17bc5a43398e16.tar.bz2 android_packages_apps_Snap-467c237e0694853a833b52fa8d17bc5a43398e16.zip | |
SnapdragonCamera: Completed the function of FS
Completed the function of FS for special sensor mode.
CRs-Fixed: 2334834
Change-Id: Ia32111be5e1fd14bdb31407a43ad8eb3b97f5415
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values/camera2arrays.xml | 9 | ||||
| -rwxr-xr-x | res/values/qcomstrings.xml | 7 | ||||
| -rwxr-xr-x | res/xml/capture_preferences.xml | 7 | ||||
| -rwxr-xr-x | res/xml/setting_menu_preferences.xml | 9 |
4 files changed, 32 insertions, 0 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index a6d312ab3..e1e2150d7 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -1217,4 +1217,13 @@ for time lapse recording --> <item>@string/pref_camera2_capture_mfnr_entry_value_enable</item> </string-array> + <string-array name="pref_camera2_fs2_entries" translatable="false"> + <item>@string/pref_camera2_fs2_entry_disable</item> + <item>@string/pref_camera2_fs2_entry_enable</item> + </string-array> + + <string-array name="pref_camera2_fs2_entryvalues" translatable="false"> + <item>@string/pref_camera2_fs2_entry_value_disable</item> + <item>@string/pref_camera2_fs2_entry_value_enable</item> + </string-array> </resources> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 62e0a4108..721620133 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -1289,5 +1289,12 @@ <string name="pref_camera2_capture_mfnr_entry_value_enable" translatable="false">1</string> <string name="pref_camera2_capture_mfnr_entry_value_disable" translatable="false">0</string> + <string name="pref_camera2_fs2_title" translatable="true">FastShutter</string> + <string name="pref_camera2_fs2_default" translatable="false">0</string> + <string name="pref_camera2_fs2_entry_enable" translatable="true">enable</string> + <string name="pref_camera2_fs2_entry_disable" translatable="true">disable</string> + <string name="pref_camera2_fs2_entry_value_enable" translatable="false">1</string> + <string name="pref_camera2_fs2_entry_value_disable" translatable="false">0</string> + </resources> diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 0337f3e37..cb5b73e2d 100755 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -462,4 +462,11 @@ camera:entries="@array/pref_camera2_capture_mfnr_entries" camera:entryValues="@array/pref_camera2_capture_mfnr_entryvalues" /> + <ListPreference + camera:key="pref_camera2_fs2_key" + camera:defaultValue="@string/pref_camera2_fs2_default" + camera:title="@string/pref_camera2_fs2_title" + camera:entries="@array/pref_camera2_fs2_entries" + camera:entryValues="@array/pref_camera2_fs2_entryvalues" /> + </PreferenceGroup> diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index af1b3901b..7bdbca9f0 100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -483,5 +483,14 @@ android:layout="@layout/preference" android:summary="%s"/> + <ListPreference + android:key="pref_camera2_fs2_key" + android:defaultValue="@string/pref_camera2_fs2_default" + android:title="@string/pref_camera2_fs2_title" + android:entries="@array/pref_camera2_fs2_entries" + android:entryValues="@array/pref_camera2_fs2_entryvalues" + android:layout="@layout/preference" + android:summary="%s"/> + </PreferenceCategory> </PreferenceScreen> |