diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-09-11 00:52:56 +0300 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-09-17 23:26:03 +0300 |
| commit | 35a38acb7943b018c5d239d00c4ad48da5072b87 (patch) | |
| tree | 4abe60876a717d5e0e1d412d2897620c4c2306c7 /res | |
| parent | 3bef2d9db59db7ff9d19cb6aa5e4bc3cd9381471 (diff) | |
| download | android_packages_apps_Snap-35a38acb7943b018c5d239d00c4ad48da5072b87.tar.gz android_packages_apps_Snap-35a38acb7943b018c5d239d00c4ad48da5072b87.tar.bz2 android_packages_apps_Snap-35a38acb7943b018c5d239d00c4ad48da5072b87.zip | |
Snap: Cleanup video profile handling
* Fix camcorder crashes on older devices
Revert "SnapdragonCamera: Fix compatibility issues with KK."
This reverts commit 0d33346534a728a1f8efaec05fcdccbe3e5440e1.
Revert "SnapdragonCamera: Throw error popup for unsupported video profile."
This reverts commit 3e50703cff0bc243b922a2299c58a45a4cbd91a9.
Change-Id: I1152180a590650a7583430936f3759d1831e91dd
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 42 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 3 |
2 files changed, 28 insertions, 17 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 706d7a412..1d5ef0604 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -31,21 +31,35 @@ <item>@string/pref_video_quality_entry_cif</item> <item>@string/pref_video_quality_entry_qvga</item> <item>@string/pref_video_quality_entry_qcif</item> - </string-array> + </string-array> + <string-array name="pref_video_quality_entryvalues" translatable="false"> - <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>480x360</item> - <item>400x240</item> - <item>352x288</item> - <item>320x240</item> - <item>176x144</item> + <!-- 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> </string-array> <!-- Camera Preference save path entries --> diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 135ab48d5..0779868b8 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -319,9 +319,6 @@ <!-- The message is shown in dialog when the app encounters an unsupported video resolution--> <string name="error_app_unsupported">Unsupported video resolution for this encoder type</string> - <!-- The message is shown in dialog when the app encounters an unsupported video profile--> - <string name="error_app_unsupported_profile">Unsupported video profile</string> - <!--The message is shown in dialog when the raw snapshot is selected in zsl mode--> <string name="error_app_unsupported_raw">Raw picture format is not supported in zsl mode, change to JPEG |