Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-03-14 16:15:26 +01:00
commit 3d4cf4b474
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java
View file

@ -200,19 +200,19 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity {
List<String> qNames = new ArrayList<>(); List<String> qNames = new ArrayList<>();
List<Integer> qValues = new ArrayList<>(); List<Integer> qValues = new ArrayList<>();
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_LOW)) { if (Build.VERSION.SDK_INT < 11 || CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_LOW)) {
qNames.add(getString(R.string.av_video_quality_low)); qNames.add(getString(R.string.av_video_quality_low));
qValues.add(CamcorderProfile.QUALITY_LOW); qValues.add(CamcorderProfile.QUALITY_LOW);
} }
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_480P)) { if (Build.VERSION.SDK_INT >= 11 && CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_480P)) {
qNames.add("720 x 480 (480p)"); qNames.add("720 x 480 (480p)");
qValues.add(CamcorderProfile.QUALITY_480P); qValues.add(CamcorderProfile.QUALITY_480P);
} }
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_720P)) { if (Build.VERSION.SDK_INT >= 11 && CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_720P)) {
qNames.add("1280 x 720 (720p)"); qNames.add("1280 x 720 (720p)");
qValues.add(CamcorderProfile.QUALITY_720P); qValues.add(CamcorderProfile.QUALITY_720P);
} }
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_1080P)) { if (Build.VERSION.SDK_INT >= 11 && CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_1080P)) {
qNames.add("1920 x 1080 (1080p)"); qNames.add("1920 x 1080 (1080p)");
qValues.add(CamcorderProfile.QUALITY_1080P); qValues.add(CamcorderProfile.QUALITY_1080P);
} }
@ -220,7 +220,7 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity {
qNames.add("3840x2160 (2160p)"); qNames.add("3840x2160 (2160p)");
qValues.add(CamcorderProfile.QUALITY_2160P); qValues.add(CamcorderProfile.QUALITY_2160P);
} }
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_HIGH)) { if (Build.VERSION.SDK_INT < 11 || CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_HIGH)) {
qNames.add(getString(R.string.av_video_quality_high)); qNames.add(getString(R.string.av_video_quality_high));
qValues.add(CamcorderProfile.QUALITY_HIGH); qValues.add(CamcorderProfile.QUALITY_HIGH);
} }