diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:48:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:48:51 -0700 |
| commit | 1db6b32f781ac83ca8b7913154a72f2de01acd67 (patch) | |
| tree | 52a41312fae614acdf321d1ee8aaf01ee6257413 /res | |
| parent | 717d30db6542d59334b139e2460fa9c45aca5065 (diff) | |
| parent | 2a853d42d02a7beb054c904df29da07126aeaa35 (diff) | |
| download | android_packages_apps_Snap-1db6b32f781ac83ca8b7913154a72f2de01acd67.tar.gz android_packages_apps_Snap-1db6b32f781ac83ca8b7913154a72f2de01acd67.tar.bz2 android_packages_apps_Snap-1db6b32f781ac83ca8b7913154a72f2de01acd67.zip | |
Merge "SnapdragonCamera: Add continuous shot and count down" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/capture_preferences.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml index 7ee4ae465..3bab09eb0 100644 --- a/res/xml/capture_preferences.xml +++ b/res/xml/capture_preferences.xml @@ -165,4 +165,18 @@ camera:key="pref_camera2_iso_key" camera:singleIcon="@drawable/ic_settings_iso" camera:title="@string/pref_camera_iso_title"/> + + <IconListPreference + camera:defaultValue="@string/pref_camera_longshot_default" + camera:entries="@array/pref_camera2_longshot_entries" + camera:entryValues="@array/pref_camera2_longshot_entryvalues" + camera:key="pref_camera2_longshot_key" + camera:singleIcon="@drawable/ic_settings_continuous" + camera:title="@string/pref_camera_longshot_title"/> + + <CountDownTimerPreference + camera:defaultValue="@string/pref_camera_timer_default" + camera:key="pref_camera2_timer_key" + camera:singleIcon="@drawable/ic_settings_countdowntimer" + camera:title="@string/pref_camera_timer_title"/> </PreferenceGroup> |