mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-11-18 08:05:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into menu-consistency

Browse Source
This commit is contained in:
Stypox
2019-06-14 09:40:40 +02:00
committed by GitHub
parent b6cfb8a3dc 171b258d5c
commit f0ba6afbdf
53 changed files with 1961 additions and 3275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
View File

@@ -297,6 +297,7 @@ public abstract class VideoPlayer extends BasePlayer
return true;
});
// Add all available captions
for (int i = 0; i < availableLanguages.size(); i++) {
final String captionLanguage = availableLanguages.get(i);
MenuItem captionItem = captionPopupMenu.getMenu().add(captionPopupMenuGroupId,
@@ -506,7 +507,7 @@ public abstract class VideoPlayer extends BasePlayer
}
// Normalize mismatching language strings
final String preferredLanguage = trackSelector.getParameters().preferredTextLanguage;
final String preferredLanguage = trackSelector.getPreferredTextLanguage();
// Build UI
buildCaptionMenu(availableLanguages);
if (trackSelector.getParameters().getRendererDisabled(textRenderer) ||