diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-06 15:30:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-06 15:30:20 -0800 |
| commit | fb7a974380cf55206f546ffba5ee58d9b607d409 (patch) | |
| tree | 3748bf70ddb0ab2500a67d7315c7ef149d0aad54 /src/com/android/camera/SettingsActivity.java | |
| parent | a3c54129d6e8ac789b5e6b5e6fbaf3c051c35305 (diff) | |
| parent | 0160260eb1991093e6961c63c7a72bd4b80c7589 (diff) | |
| download | android_packages_apps_Snap-fb7a974380cf55206f546ffba5ee58d9b607d409.tar.gz android_packages_apps_Snap-fb7a974380cf55206f546ffba5ee58d9b607d409.tar.bz2 android_packages_apps_Snap-fb7a974380cf55206f546ffba5ee58d9b607d409.zip | |
Merge "SnapdragonCamera: Add zoom option to developer option for camera2" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/SettingsActivity.java')
| -rw-r--r-- | src/com/android/camera/SettingsActivity.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/SettingsActivity.java b/src/com/android/camera/SettingsActivity.java index a54be02af..d3f0b5a96 100644 --- a/src/com/android/camera/SettingsActivity.java +++ b/src/com/android/camera/SettingsActivity.java @@ -217,6 +217,7 @@ public class SettingsActivity extends PreferenceActivity { updatePreference(SettingsManager.KEY_EXPOSURE); updatePreference(SettingsManager.KEY_VIDEO_HIGH_FRAME_RATE); updatePreference(SettingsManager.KEY_VIDEO_ENCODER); + updatePreference(SettingsManager.KEY_ZOOM); Map<String, SettingsManager.Values> map = mSettingsManager.getValuesMap(); Set<Map.Entry<String, SettingsManager.Values>> set = map.entrySet(); |