diff options
| author | Alok Kediya <kediya@codeaurora.org> | 2013-09-27 20:22:45 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:39:18 -0600 |
| commit | 0dc64ffddb06d0b41e65f10c742caec52e8b0436 (patch) | |
| tree | 43344ecae06fa3aa8b2384d6208175f514965017 /res/values/arrays.xml | |
| parent | 5213f27da56b6b1ff989ea9eda28bac7dce720b5 (diff) | |
| download | android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.tar.gz android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.tar.bz2 android_packages_apps_Snap-0dc64ffddb06d0b41e65f10c742caec52e8b0436.zip | |
Camera : Enable camera and camcorder UI features..
Added keys and APIs for enabling QC features from UI.
(cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21)
Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/PhotoMenu.java
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java
Conflicts:
src/com/android/camera/CameraSettings.java
src/com/android/camera/VideoModule.java
(cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376)
(cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
Diffstat (limited to 'res/values/arrays.xml')
| -rw-r--r-- | res/values/arrays.xml | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 02ece7733..621f1c996 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -381,6 +381,20 @@ <item>@string/pref_camera_scenemode_entry_auto</item> <item>@string/pref_camera_scenemode_entry_sunset</item> <item>@string/pref_camera_scenemode_entry_party</item> + <item>@string/pref_camera_scenemode_entry_asd</item> + <item>@string/pref_camera_scenemode_entry_portrait</item> + <item>@string/pref_camera_scenemode_entry_landscape</item> + <item>@string/pref_camera_scenemode_entry_night_portrait</item> + <item>@string/pref_camera_scenemode_entry_theatre</item> + <item>@string/pref_camera_scenemode_entry_beach</item> + <item>@string/pref_camera_scenemode_entry_snow</item> + <item>@string/pref_camera_scenemode_entry_steadyphoto</item> + <item>@string/pref_camera_scenemode_entry_fireworks</item> + <item>@string/pref_camera_scenemode_entry_sports</item> + <item>@string/pref_camera_scenemode_entry_candlelight</item> + <item>@string/pref_camera_scenemode_entry_backlight</item> + <item>@string/pref_camera_scenemode_entry_flowers</item> + <item>@string/pref_camera_scenemode_entry_ar</item> </string-array> <string-array name="pref_camera_scenemode_labels"> @@ -405,6 +419,20 @@ <item>auto</item> <item>sunset</item> <item>party</item> + <item>asd</item> + <item>portrait</item> + <item>landscape</item> + <item>night-portrait</item> + <item>theatre</item> + <item>beach</item> + <item>snow</item> + <item>steadyphoto</item> + <item>fireworks</item> + <item>sports</item> + <item>candlelight</item> + <item>backlight</item> + <item>flowers</item> + <item>AR</item> </string-array> <array name="camera_id_entries" translatable="false"> |