summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSampath Vangaveti <sampathv@codeaurora.org>2016-02-18 18:23:13 +0530
committerSteve Kondik <steve@cyngn.com>2016-08-21 18:46:32 -0700
commitdbccf969d529ba0eed79c8e69e9e65d5c172f505 (patch)
tree78834f0cf733f5f6475fb8446916a8830b981b9d
parent7b6b27b86db2c5b813b278806a36f60e219a7a0d (diff)
downloadandroid_packages_apps_Snap-dbccf969d529ba0eed79c8e69e9e65d5c172f505.zip
android_packages_apps_Snap-dbccf969d529ba0eed79c8e69e9e65d5c172f505.tar.gz
android_packages_apps_Snap-dbccf969d529ba0eed79c8e69e9e65d5c172f505.tar.bz2
SnapdragonCamera: Add 24 MP resolution
Added 24MP resolution(5656x4242) to the UI CRs-Fixed: 982283 Change-Id: I18628d84d76cd5c77a7b96d9074381548800fe4b
-rw-r--r--res/values/arrays.xml2
-rw-r--r--res/values/camera2arrays.xml71
-rw-r--r--res/values/cm_strings.xml2
-rw-r--r--res/xml/capture_preferences.xml4
4 files changed, 6 insertions, 73 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index a48de58..017d5b4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -157,6 +157,7 @@
<!-- Camera Preferences Picture size dialog box entries -->
<string-array name="pref_camera_picturesize_entries" translatable="false">
+ <item>@string/pref_camera_picturesize_entry_24mp</item>
<item>@string/pref_camera_picturesize_entry_21mp</item> <!-- 540 -->
<item>@string/pref_camera_picturesize_entry_20_7mp</item> <!-- 530 -->
<item>@string/pref_camera_picturesize_entry_20_1mp_wide</item> <!-- 520 -->
@@ -230,6 +231,7 @@
size to the first one in the list that is also supported by the
driver -->
<string-array name="pref_camera_picturesize_entryvalues" translatable="false">
+ <item>5656x4242</item>
<item>5344x4008</item> <!-- 540 -->
<item>5248x3936</item> <!-- 530 -->
<item>5376x3752</item> <!-- 520 -->
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 13a2870..bee1164 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -312,77 +312,6 @@
<item>1</item>
</string-array>
- <!-- Camera Preferences Picture size dialog box entries -->
- <string-array name="pref_camera2_picturesize_entries" translatable="false">
- <item>@string/pref_camera_picturesize_entry_24mp</item>
- <item>@string/pref_camera_picturesize_entry_21mp</item>
- <item>@string/pref_camera_picturesize_entry_16mp</item>
- <item>@string/pref_camera_picturesize_entry_16mp_wide</item>
- <item>@string/pref_camera_picturesize_entry_13mp</item>
- <item>@string/pref_camera_picturesize_entry_12mp</item>
- <item>@string/pref_camera_picturesize_entry_8mp</item>
- <item>@string/pref_camera_picturesize_entry_8mp</item>
- <item>@string/pref_camera_picturesize_entry_square</item>
- <item>@string/pref_camera_picturesize_entry_5mp</item>
- <item>@string/pref_camera_picturesize_entry_5mp</item>
- <item>@string/pref_camera_picturesize_entry_5mp</item>
- <item>@string/pref_camera_picturesize_entry_4mp_wide</item>
- <item>@string/pref_camera_picturesize_entry_3mp</item>
- <item>@string/pref_camera_picturesize_entry_3mp</item>
- <item>@string/pref_camera_picturesize_entry_1920x1080</item>
- <item>@string/pref_camera_picturesize_entry_2mp</item>
- <item>@string/pref_camera_picturesize_entry_2mp_wide</item>
- <item>@string/pref_camera_picturesize_entry_1_5mp</item>
- <item>@string/pref_camera_picturesize_entry_1_3mp</item>
- <item>@string/pref_camera_picturesize_entry_1280x768</item>
- <item>@string/pref_camera_picturesize_entry_1280x720</item>
- <item>@string/pref_camera_picturesize_entry_1mp</item>
- <item>@string/pref_camera_picturesize_entry_800x600</item>
- <item>@string/pref_camera_picturesize_entry_800x480</item>
- <item>@string/pref_camera_picturesize_entry_960x720</item>
- <item>@string/pref_camera_picturesize_entry_720x480</item>
- <item>@string/pref_camera_picturesize_entry_vga</item>
- <item>@string/pref_camera_picturesize_entry_352x288</item>
- <item>@string/pref_camera_picturesize_entry_qvga</item>
- <item>@string/pref_camera_picturesize_entry_176x144</item>
- </string-array>
- <!-- When launching the camera app first time, we will set the picture
- size to the first one in the list that is also supported by the
- driver -->
- <string-array name="pref_camera2_picturesize_entryvalues" translatable="false">
- <item>5656x4242</item>
- <item>5344x4008</item>
- <item>4608x3456</item>
- <item>5312x2988</item>
- <item>4160x3120</item>
- <item>4000x3000</item>
- <item>3840x2160</item>
- <item>3264x2448</item>
- <item>2976x2976</item>
- <item>2592x1944</item>
- <item>2592x1936</item>
- <item>2560x1920</item>
- <item>2688x1512</item>
- <item>2048x1536</item>
- <item>2048x1520</item>
- <item>1920x1080</item>
- <item>1600x1200</item>
- <item>1920x1088</item>
- <item>1440x1080</item>
- <item>1280x960</item>
- <item>1280x768</item>
- <item>1280x720</item>
- <item>1024x768</item>
- <item>800x600</item>
- <item>800x480</item>
- <item>960x720</item>
- <item>720x480</item>
- <item>640x480</item>
- <item>352x288</item>
- <item>320x240</item>
- <item>176x144</item>
- </string-array>
-
<!-- Camera Preferences focus mode dialog box entries -->
<string-array name="pref_camera2_focusmode_entries" translatable="false">
<item>@string/pref_camera_focusmode_entry_auto</item>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index e82717e..c757a15 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -16,6 +16,8 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Settings screen, dialog choice for 24 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_24mp">24M pixels</string>
<!-- Settings screen, dialog choice for 21 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_21mp">21 MP</string>
<!-- Settings screen, dialog choice for 20.7 megapixels picture size [CHAR LIMIT=15] -->
diff --git a/res/xml/capture_preferences.xml b/res/xml/capture_preferences.xml
index 0c30401..a71ce6d 100644
--- a/res/xml/capture_preferences.xml
+++ b/res/xml/capture_preferences.xml
@@ -144,8 +144,8 @@
camera:title="@string/pref_camera_id_title"/>
<IconListPreference
- camera:entries="@array/pref_camera2_picturesize_entries"
- camera:entryValues="@array/pref_camera2_picturesize_entryvalues"
+ camera:entries="@array/pref_camera_picturesize_entries"
+ camera:entryValues="@array/pref_camera_picturesize_entryvalues"
camera:key="pref_camera2_picturesize_key"
camera:singleIcon="@drawable/ic_settings_picturesize"
camera:title="@string/pref_camera_picturesize_title"/>