diff options
author | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2014-11-26 19:07:08 +0530 |
---|---|---|
committer | Sai Kumar Sanagavarapu <ssanagav@codeaurora.org> | 2014-11-26 19:20:01 +0530 |
commit | 0d33346534a728a1f8efaec05fcdccbe3e5440e1 (patch) | |
tree | 1534c26bcae18008739306121e639a5e30797016 /res | |
parent | 5d09f62dd4aa43c3cdd1f0b1e6cd9145c2021879 (diff) | |
download | android_packages_apps_Snap-0d33346534a728a1f8efaec05fcdccbe3e5440e1.tar.gz android_packages_apps_Snap-0d33346534a728a1f8efaec05fcdccbe3e5440e1.tar.bz2 android_packages_apps_Snap-0d33346534a728a1f8efaec05fcdccbe3e5440e1.zip |
SnapdragonCamera: Fix compatibility issues with KK.
1. Remove openLegacy call to open camera.
2. Use generic camcorder profile query mechanism instead of
hardcoding profile enums in app.
3. Fix NPE during startpreview if mParameters is null.
Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094
Diffstat (limited to 'res')
-rw-r--r-- | res/values/arrays.xml | 37 | ||||
-rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 14 insertions, 27 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 4ec1949da..40ce12a74 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -31,32 +31,19 @@ <item>@string/pref_video_quality_entry_qvga</item> <item>@string/pref_video_quality_entry_qcif</item> </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_WQVGA --> - <item>11</item> - <!-- The integer value of CamcorderProfile.QUALITY_CIF --> - <item>@string/pref_video_quality_default</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>864x480</item> + <item>800x480</item> + <item>640x480</item> + <item>400x240</item> + <item>352x288</item> + <item>320x240</item> + <item>176x144</item> </string-array> <!-- Camera Preference save path entries --> diff --git a/res/values/strings.xml b/res/values/strings.xml index 63de736bc..d10696381 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -238,8 +238,8 @@ <!-- The Video quality settings in preference [CHAR LIMIT=21] --> <string name="pref_video_quality_title">Video quality</string> - <!-- The default quality value is 3 (CIF) --> - <string name="pref_video_quality_default" translatable="false">3</string> + <!-- The default quality value is (CIF) --> + <string name="pref_video_quality_default" translatable="false">352x288</string> <!-- Video quality setting entry. Videos will be recorded in 4k DCI quality. [CHAR LIMIT=24] --> <string name="pref_video_quality_entry_4kdci" translatable="false"> |