summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorSai Kumar Sanagavarapu <ssanagav@codeaurora.org>2016-01-07 21:04:11 +0100
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2016-01-07 13:26:05 -0800
commit04568574c6a24efcf8d15426d133979df557ea2e (patch)
treefac66607f4bb030ebaee7a0b7d235b183e92197e /res/values
parent6bf48d33cacbdcc1df5de29c5a07b1cf5bd1a974 (diff)
downloadandroid_packages_apps_Snap-04568574c6a24efcf8d15426d133979df557ea2e.tar.gz
android_packages_apps_Snap-04568574c6a24efcf8d15426d133979df557ea2e.tar.bz2
android_packages_apps_Snap-04568574c6a24efcf8d15426d133979df557ea2e.zip
SnapdragonCamera: Query camcorder profiles before usage
1. Use generic camcorder profile query mechanism instead of hardcoding profile enums in app. 2. Fix NPE during startpreview if mFocusManager is null. Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094
Diffstat (limited to 'res/values')
-rw-r--r--res/values/arrays.xml35
1 files changed, 9 insertions, 26 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 969304ea6..42ef4c52d 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -34,32 +34,15 @@
</string-array>
<string-array name="pref_video_quality_entryvalues" translatable="false">
- <!-- The integer value of CamcorderProfile.QUALITY_4kDCI -->
- <item>13</item>
- <!-- The integer value of CamcorderProfile.QUALITY_2160P -->
- <item>8</item>
- <!-- The integer value of CamcorderProfile.QUALITY_1080P -->
- <item>6</item>
- <!-- The integer value of CamcorderProfile.QUALITY_720P -->
- <item>5</item>
- <!-- The integer value of CamcorderProfile.QUALITY_480P -->
- <item>4</item>
- <!-- The integer value of CamcorderProfile.QUALITY_FWVGA -->
- <item>12</item>
- <!-- The integer value of CamcorderProfile.QUALITY_WVGA -->
- <item>9</item>
- <!-- The integer value of CamcorderProfile.QUALITY_VGA -->
- <item>10</item>
- <!-- The integer value of CamcorderProfile.QUALITY_HVGA -->
- <item>19</item>
- <!-- The integer value of CamcorderProfile.QUALITY_WQVGA -->
- <item>11</item>
- <!-- The integer value of CamcorderProfile.QUALITY_CIF -->
- <item>3</item>
- <!-- The integer value of CamcorderProfile.QUALITY_QVGA -->
- <item>7</item>
- <!-- The integer value of CamcorderProfile.QUALITY_QCIF -->
- <item>2</item>
+ <item>4096x2160</item>
+ <item>3840x2160</item>
+ <item>1920x1080</item>
+ <item>1280x720</item>
+ <item>720x480</item>
+ <item>640x480</item>
+ <item>352x288</item>
+ <item>320x240</item>
+ <item>176x144</item>
</string-array>
<!-- These values correspond to the time interval between frame capture in millseconds