diff --git a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java index 65a07b6eb5..245b7bf5fe 100644 --- a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java +++ b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java @@ -362,6 +362,9 @@ public class PlayerControlView extends FrameLayout { public static final int MAX_WINDOWS_FOR_MULTI_WINDOW_TIME_BAR = 100; /** The maximum interval between time bar position updates. */ private static final int MAX_UPDATE_INTERVAL_MS = 1_000; + // LINT.IfChange(playback_speeds) + private static final float[] PLAYBACK_SPEEDS = + new float[] {0.25f, 0.5f, 0.75f, 1f, 1.25f, 1.5f, 2f}; private static final int SETTINGS_PLAYBACK_SPEED_POSITION = 0; private static final int SETTINGS_AUDIO_TRACK_SELECTION_POSITION = 1; @@ -688,8 +691,7 @@ public class PlayerControlView extends FrameLayout { audioTrackSelectionAdapter = new AudioTrackSelectionAdapter(); playbackSpeedAdapter = new PlaybackSpeedAdapter( - resources.getStringArray(R.array.exo_playback_speeds), - resources.getIntArray(R.array.exo_speed_multiplied_by_100)); + resources.getStringArray(R.array.exo_controls_playback_speeds), PLAYBACK_SPEEDS); fullScreenExitDrawable = resources.getDrawable(R.drawable.exo_styled_controls_fullscreen_exit); fullScreenEnterDrawable = @@ -1879,20 +1881,19 @@ public class PlayerControlView extends FrameLayout { private final class PlaybackSpeedAdapter extends RecyclerView.Adapter { private final String[] playbackSpeedTexts; - private final int[] playbackSpeedsMultBy100; + private final float[] playbackSpeeds; private int selectedIndex; - public PlaybackSpeedAdapter(String[] playbackSpeedTexts, int[] playbackSpeedsMultBy100) { + public PlaybackSpeedAdapter(String[] playbackSpeedTexts, float[] playbackSpeeds) { this.playbackSpeedTexts = playbackSpeedTexts; - this.playbackSpeedsMultBy100 = playbackSpeedsMultBy100; + this.playbackSpeeds = playbackSpeeds; } public void updateSelectedIndex(float playbackSpeed) { - int currentSpeedMultBy100 = Math.round(playbackSpeed * 100); int closestMatchIndex = 0; - int closestMatchDifference = Integer.MAX_VALUE; - for (int i = 0; i < playbackSpeedsMultBy100.length; i++) { - int difference = Math.abs(currentSpeedMultBy100 - playbackSpeedsMultBy100[i]); + float closestMatchDifference = Float.MAX_VALUE; + for (int i = 0; i < playbackSpeeds.length; i++) { + float difference = Math.abs(playbackSpeed - playbackSpeeds[i]); if (difference < closestMatchDifference) { closestMatchIndex = i; closestMatchDifference = difference; @@ -1923,8 +1924,7 @@ public class PlayerControlView extends FrameLayout { holder.itemView.setOnClickListener( v -> { if (position != selectedIndex) { - float speed = playbackSpeedsMultBy100[position] / 100.0f; - setPlaybackSpeed(speed); + setPlaybackSpeed(playbackSpeeds[position]); } settingsWindow.dismiss(); }); diff --git a/libraries/ui/src/main/res/values-af/strings.xml b/libraries/ui/src/main/res/values-af/strings.xml index 15aeab0729..4511839582 100644 --- a/libraries/ui/src/main/res/values-af/strings.xml +++ b/libraries/ui/src/main/res/values-af/strings.xml @@ -46,7 +46,6 @@ Deaktiveer onderskrifte Aktiveer onderskrifte Spoed - Normaal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-am/strings.xml b/libraries/ui/src/main/res/values-am/strings.xml index 13d3bfc7a5..a35bf1a6f5 100644 --- a/libraries/ui/src/main/res/values-am/strings.xml +++ b/libraries/ui/src/main/res/values-am/strings.xml @@ -46,7 +46,6 @@ የግርጌ ጽሑፎችን አሰናክል የግርጌ ጽሑፎችን አንቃ ፍጥነት - መደበኛ 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-ar/strings.xml b/libraries/ui/src/main/res/values-ar/strings.xml index df226a371f..c7e48f7879 100644 --- a/libraries/ui/src/main/res/values-ar/strings.xml +++ b/libraries/ui/src/main/res/values-ar/strings.xml @@ -54,7 +54,6 @@ إيقاف الترجمة تفعيل الترجمة السرعة - عادية أسرع بـ 0.25 مرة أسرع بـ 0.5 مرات diff --git a/libraries/ui/src/main/res/values-az/strings.xml b/libraries/ui/src/main/res/values-az/strings.xml index 8e5788f329..5f8cce18e3 100644 --- a/libraries/ui/src/main/res/values-az/strings.xml +++ b/libraries/ui/src/main/res/values-az/strings.xml @@ -46,7 +46,6 @@ Subtitrləri deaktiv edin Subtitrləri aktiv edin Sürət - Normal 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-b+sr+Latn/strings.xml b/libraries/ui/src/main/res/values-b+sr+Latn/strings.xml index 41b00e8af0..8173fb6361 100644 --- a/libraries/ui/src/main/res/values-b+sr+Latn/strings.xml +++ b/libraries/ui/src/main/res/values-b+sr+Latn/strings.xml @@ -48,7 +48,6 @@ Onemogući titlove Omogući titlove Brzina - Uobičajena 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-be/strings.xml b/libraries/ui/src/main/res/values-be/strings.xml index 9e30b08753..82518faecf 100644 --- a/libraries/ui/src/main/res/values-be/strings.xml +++ b/libraries/ui/src/main/res/values-be/strings.xml @@ -50,7 +50,6 @@ Выключыць субцітры Уключыць субцітры Хуткасць - Звычайная 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-bg/strings.xml b/libraries/ui/src/main/res/values-bg/strings.xml index f1572bb853..056c5b9e83 100644 --- a/libraries/ui/src/main/res/values-bg/strings.xml +++ b/libraries/ui/src/main/res/values-bg/strings.xml @@ -46,7 +46,6 @@ Деактивиране на субтитрите Активиране на субтитрите Скорост - Нормално 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-bn/strings.xml b/libraries/ui/src/main/res/values-bn/strings.xml index 8f58cdd79e..bf438cc335 100644 --- a/libraries/ui/src/main/res/values-bn/strings.xml +++ b/libraries/ui/src/main/res/values-bn/strings.xml @@ -46,7 +46,6 @@ সাবটাইটেল বন্ধ করুন সাবটাইটেল চালু করুন স্পিড - সাধারণ ০.২৫x ০.৫x diff --git a/libraries/ui/src/main/res/values-bs/strings.xml b/libraries/ui/src/main/res/values-bs/strings.xml index 65f74e0139..8ce4cf7648 100644 --- a/libraries/ui/src/main/res/values-bs/strings.xml +++ b/libraries/ui/src/main/res/values-bs/strings.xml @@ -48,7 +48,6 @@ Onemogućavanje titlova Omogućavanje titlova Brzina - Normalno 0,25 x 0,5 x diff --git a/libraries/ui/src/main/res/values-ca/strings.xml b/libraries/ui/src/main/res/values-ca/strings.xml index 9afef41b27..46aef87dd1 100644 --- a/libraries/ui/src/main/res/values-ca/strings.xml +++ b/libraries/ui/src/main/res/values-ca/strings.xml @@ -46,7 +46,6 @@ Desactiva els subtítols Activa els subtítols Velocitat - Normal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-cs/strings.xml b/libraries/ui/src/main/res/values-cs/strings.xml index 94e1357037..6144f3cad3 100644 --- a/libraries/ui/src/main/res/values-cs/strings.xml +++ b/libraries/ui/src/main/res/values-cs/strings.xml @@ -50,7 +50,6 @@ Vypnout titulky Zapnout titulky Rychlost - Normální 0,25× 0,5× diff --git a/libraries/ui/src/main/res/values-da/strings.xml b/libraries/ui/src/main/res/values-da/strings.xml index d22d50fca4..e7a07fef48 100644 --- a/libraries/ui/src/main/res/values-da/strings.xml +++ b/libraries/ui/src/main/res/values-da/strings.xml @@ -46,7 +46,6 @@ Deaktiver undertekster Aktivér undertekster Hastighed - Normal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-de/strings.xml b/libraries/ui/src/main/res/values-de/strings.xml index 3570082be1..05087df6a2 100644 --- a/libraries/ui/src/main/res/values-de/strings.xml +++ b/libraries/ui/src/main/res/values-de/strings.xml @@ -46,7 +46,6 @@ Untertitel deaktivieren Untertitel aktivieren Geschwindigkeit - Normal 0,25-fach 0,5-fach diff --git a/libraries/ui/src/main/res/values-el/strings.xml b/libraries/ui/src/main/res/values-el/strings.xml index 02a0c8f727..d7d00f184e 100644 --- a/libraries/ui/src/main/res/values-el/strings.xml +++ b/libraries/ui/src/main/res/values-el/strings.xml @@ -46,7 +46,6 @@ Απενεργοποίηση υπότιτλων Ενεργοποίηση υπότιτλων Ταχύτητα - Κανονική 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-en-rAU/strings.xml b/libraries/ui/src/main/res/values-en-rAU/strings.xml index d686f09564..c3a1c8a5aa 100644 --- a/libraries/ui/src/main/res/values-en-rAU/strings.xml +++ b/libraries/ui/src/main/res/values-en-rAU/strings.xml @@ -46,7 +46,6 @@ Disable subtitles Enable subtitles Speed - Normal 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-en-rGB/strings.xml b/libraries/ui/src/main/res/values-en-rGB/strings.xml index d686f09564..c3a1c8a5aa 100644 --- a/libraries/ui/src/main/res/values-en-rGB/strings.xml +++ b/libraries/ui/src/main/res/values-en-rGB/strings.xml @@ -46,7 +46,6 @@ Disable subtitles Enable subtitles Speed - Normal 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-en-rIN/strings.xml b/libraries/ui/src/main/res/values-en-rIN/strings.xml index d686f09564..c3a1c8a5aa 100644 --- a/libraries/ui/src/main/res/values-en-rIN/strings.xml +++ b/libraries/ui/src/main/res/values-en-rIN/strings.xml @@ -46,7 +46,6 @@ Disable subtitles Enable subtitles Speed - Normal 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-es-rUS/strings.xml b/libraries/ui/src/main/res/values-es-rUS/strings.xml index c625cfcd28..faaf430448 100644 --- a/libraries/ui/src/main/res/values-es-rUS/strings.xml +++ b/libraries/ui/src/main/res/values-es-rUS/strings.xml @@ -46,7 +46,6 @@ Inhabilitar subtítulos Habilitar subtítulos Velocidad - Normal 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-es/strings.xml b/libraries/ui/src/main/res/values-es/strings.xml index b17cebeddd..f333c1d068 100644 --- a/libraries/ui/src/main/res/values-es/strings.xml +++ b/libraries/ui/src/main/res/values-es/strings.xml @@ -46,7 +46,6 @@ Inhabilitar subtítulos Habilitar subtítulos Velocidad - Normal ×0,25 ×0,5 diff --git a/libraries/ui/src/main/res/values-et/strings.xml b/libraries/ui/src/main/res/values-et/strings.xml index 2633f362d5..1f15da226d 100644 --- a/libraries/ui/src/main/res/values-et/strings.xml +++ b/libraries/ui/src/main/res/values-et/strings.xml @@ -46,7 +46,6 @@ Keela subtiitrid Luba subtiitrid Kiirus - Tavaline 0,25-kordne 0,5-kordne diff --git a/libraries/ui/src/main/res/values-eu/strings.xml b/libraries/ui/src/main/res/values-eu/strings.xml index 868c21e8a2..9fb7fa9ce0 100644 --- a/libraries/ui/src/main/res/values-eu/strings.xml +++ b/libraries/ui/src/main/res/values-eu/strings.xml @@ -46,7 +46,6 @@ Desgaitu azpitituluak Gaitu azpitituluak Abiadura - Normala 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-fa/strings.xml b/libraries/ui/src/main/res/values-fa/strings.xml index ce149d4754..5fd0d954ca 100644 --- a/libraries/ui/src/main/res/values-fa/strings.xml +++ b/libraries/ui/src/main/res/values-fa/strings.xml @@ -46,7 +46,6 @@ غیرفعال کردن زیرنویس فعال کردن زیرنویس سرعت - عادی ۰٫۲۵ برابر ۰٫۵ برابر diff --git a/libraries/ui/src/main/res/values-fi/strings.xml b/libraries/ui/src/main/res/values-fi/strings.xml index 70c3c05638..cc8acd5635 100644 --- a/libraries/ui/src/main/res/values-fi/strings.xml +++ b/libraries/ui/src/main/res/values-fi/strings.xml @@ -46,7 +46,6 @@ Poista tekstitykset käytöstä Ota tekstitykset käyttöön Nopeus - Normaali 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-fr-rCA/strings.xml b/libraries/ui/src/main/res/values-fr-rCA/strings.xml index cb5655de0e..f30d732a13 100644 --- a/libraries/ui/src/main/res/values-fr-rCA/strings.xml +++ b/libraries/ui/src/main/res/values-fr-rCA/strings.xml @@ -46,7 +46,6 @@ Désactiver les sous-titres Activer les sous-titres Vitesse - Normale 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-fr/strings.xml b/libraries/ui/src/main/res/values-fr/strings.xml index 7adfe77d72..6aaf078c29 100644 --- a/libraries/ui/src/main/res/values-fr/strings.xml +++ b/libraries/ui/src/main/res/values-fr/strings.xml @@ -46,7 +46,6 @@ Désactiver les sous-titres Activer les sous-titres Vitesse - Normale x 0,25 x 0,5 diff --git a/libraries/ui/src/main/res/values-gl/strings.xml b/libraries/ui/src/main/res/values-gl/strings.xml index fefa884c3f..fa815e60b1 100644 --- a/libraries/ui/src/main/res/values-gl/strings.xml +++ b/libraries/ui/src/main/res/values-gl/strings.xml @@ -46,7 +46,6 @@ Desactiva os subtítulos Activa os subtítulos Velocidade - Normal x 0,25 x 0,5 diff --git a/libraries/ui/src/main/res/values-gu/strings.xml b/libraries/ui/src/main/res/values-gu/strings.xml index 842eff82c4..b870f1400a 100644 --- a/libraries/ui/src/main/res/values-gu/strings.xml +++ b/libraries/ui/src/main/res/values-gu/strings.xml @@ -46,7 +46,6 @@ સબટાઇટલ બંધ કરો સબટાઇટલ ચાલુ કરો ઝડપ - સામાન્ય 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-hi/strings.xml b/libraries/ui/src/main/res/values-hi/strings.xml index e93804880b..c45305429f 100644 --- a/libraries/ui/src/main/res/values-hi/strings.xml +++ b/libraries/ui/src/main/res/values-hi/strings.xml @@ -46,7 +46,6 @@ सबटाइटल बंद करें सबटाइटल चालू करें रफ़्तार - सामान्य 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-hr/strings.xml b/libraries/ui/src/main/res/values-hr/strings.xml index c34931d548..38f630ac58 100644 --- a/libraries/ui/src/main/res/values-hr/strings.xml +++ b/libraries/ui/src/main/res/values-hr/strings.xml @@ -48,7 +48,6 @@ Onemogući titlove Omogući titlove Brzina - Obično 0,25 x 0,5 x diff --git a/libraries/ui/src/main/res/values-hu/strings.xml b/libraries/ui/src/main/res/values-hu/strings.xml index 718c0bd01f..c987398225 100644 --- a/libraries/ui/src/main/res/values-hu/strings.xml +++ b/libraries/ui/src/main/res/values-hu/strings.xml @@ -46,7 +46,6 @@ Feliratok kikapcsolása Feliratok bekapcsolása Sebesség - Normál 0,25× 0,5× diff --git a/libraries/ui/src/main/res/values-hy/strings.xml b/libraries/ui/src/main/res/values-hy/strings.xml index dad2f82a57..2b8c7a7612 100644 --- a/libraries/ui/src/main/res/values-hy/strings.xml +++ b/libraries/ui/src/main/res/values-hy/strings.xml @@ -46,7 +46,6 @@ Անջատել ենթագրերը Միացնել ենթագրերը Արագություն - Սովորական 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-in/strings.xml b/libraries/ui/src/main/res/values-in/strings.xml index efebf78bfc..dd5571b4d5 100644 --- a/libraries/ui/src/main/res/values-in/strings.xml +++ b/libraries/ui/src/main/res/values-in/strings.xml @@ -46,7 +46,6 @@ Nonaktifkan subtitel Aktifkan subtitel Kecepatan - Normal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-is/strings.xml b/libraries/ui/src/main/res/values-is/strings.xml index 15803160ea..01f3bcb362 100644 --- a/libraries/ui/src/main/res/values-is/strings.xml +++ b/libraries/ui/src/main/res/values-is/strings.xml @@ -46,7 +46,6 @@ Slökkva á skjátexta Kveikja á skjátexta Hraði - Venjulegur 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-it/strings.xml b/libraries/ui/src/main/res/values-it/strings.xml index c4ed5f8d45..8b50689367 100644 --- a/libraries/ui/src/main/res/values-it/strings.xml +++ b/libraries/ui/src/main/res/values-it/strings.xml @@ -46,7 +46,6 @@ Disattiva i sottotitoli Attiva i sottotitoli Velocità - Normale 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-iw/strings.xml b/libraries/ui/src/main/res/values-iw/strings.xml index 76d27ef981..adbe03100b 100644 --- a/libraries/ui/src/main/res/values-iw/strings.xml +++ b/libraries/ui/src/main/res/values-iw/strings.xml @@ -50,7 +50,6 @@ השבתת כתוביות הפעלת כתוביות מהירות - רגילה 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-ja/strings.xml b/libraries/ui/src/main/res/values-ja/strings.xml index 102f32a437..7333b977d4 100644 --- a/libraries/ui/src/main/res/values-ja/strings.xml +++ b/libraries/ui/src/main/res/values-ja/strings.xml @@ -46,7 +46,6 @@ 字幕の無効化 字幕の有効化 速度 - 標準 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-ka/strings.xml b/libraries/ui/src/main/res/values-ka/strings.xml index 7a92c4c041..a18089e129 100644 --- a/libraries/ui/src/main/res/values-ka/strings.xml +++ b/libraries/ui/src/main/res/values-ka/strings.xml @@ -46,7 +46,6 @@ სუბტიტრების გათიშვა სუბტიტრების ჩართვა სიჩქარე - ჩვეულებრივი 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-kk/strings.xml b/libraries/ui/src/main/res/values-kk/strings.xml index 5fb22fd7a0..be14948ef1 100644 --- a/libraries/ui/src/main/res/values-kk/strings.xml +++ b/libraries/ui/src/main/res/values-kk/strings.xml @@ -46,7 +46,6 @@ Субтитрді өшіру Субтитрді қосу Жылдамдық - Қалыпты 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-km/strings.xml b/libraries/ui/src/main/res/values-km/strings.xml index c4b34c0e7a..4e1f62bd90 100644 --- a/libraries/ui/src/main/res/values-km/strings.xml +++ b/libraries/ui/src/main/res/values-km/strings.xml @@ -46,7 +46,6 @@ បិទអក្សររត់ បើកអក្សររត់ ល្បឿន - ធម្មតា 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-kn/strings.xml b/libraries/ui/src/main/res/values-kn/strings.xml index 3336d99885..28c9496216 100644 --- a/libraries/ui/src/main/res/values-kn/strings.xml +++ b/libraries/ui/src/main/res/values-kn/strings.xml @@ -46,7 +46,6 @@ ಸಬ್‌ಟೈಟಲ್‌ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಸಬ್‌ಟೈಟಲ್‌ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ ವೇಗ - ಸಾಮಾನ್ಯ 0.25 ಪಟ್ಟು 0.5 ಪಟ್ಟು diff --git a/libraries/ui/src/main/res/values-ko/strings.xml b/libraries/ui/src/main/res/values-ko/strings.xml index b4c3013d88..0c06366b57 100644 --- a/libraries/ui/src/main/res/values-ko/strings.xml +++ b/libraries/ui/src/main/res/values-ko/strings.xml @@ -46,7 +46,6 @@ 자막 사용 중지 자막 사용 설정 속도 - 일반 0.25배속 0.5배속 diff --git a/libraries/ui/src/main/res/values-ky/strings.xml b/libraries/ui/src/main/res/values-ky/strings.xml index 404abf8251..4cb3932247 100644 --- a/libraries/ui/src/main/res/values-ky/strings.xml +++ b/libraries/ui/src/main/res/values-ky/strings.xml @@ -46,7 +46,6 @@ Коштомо жазууларды өчүрүү Коштомо жазууларды иштетүү Ылдамдык - Орточо 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-lo/strings.xml b/libraries/ui/src/main/res/values-lo/strings.xml index a0de844c37..8581b0bbc0 100644 --- a/libraries/ui/src/main/res/values-lo/strings.xml +++ b/libraries/ui/src/main/res/values-lo/strings.xml @@ -46,7 +46,6 @@ ປິດການນຳໃຊ້ຄຳແປ ເປີດການນຳໃຊ້ຄຳແປ ຄວາມໄວ - ທົ່ວໄປ 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-lt/strings.xml b/libraries/ui/src/main/res/values-lt/strings.xml index c42fc4d992..b8233d76a9 100644 --- a/libraries/ui/src/main/res/values-lt/strings.xml +++ b/libraries/ui/src/main/res/values-lt/strings.xml @@ -50,7 +50,6 @@ Išjungti subtitrus Įgalinti subtitrus Sparta - Įprasta 0,25 k. 0,5 k. diff --git a/libraries/ui/src/main/res/values-lv/strings.xml b/libraries/ui/src/main/res/values-lv/strings.xml index b524957a9c..61f1c8f4dd 100644 --- a/libraries/ui/src/main/res/values-lv/strings.xml +++ b/libraries/ui/src/main/res/values-lv/strings.xml @@ -48,7 +48,6 @@ Atspējot subtitrus Iespējot subtitrus Ātrums - Parasts 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-mk/strings.xml b/libraries/ui/src/main/res/values-mk/strings.xml index 78e6f8c0b2..8a4ff03039 100644 --- a/libraries/ui/src/main/res/values-mk/strings.xml +++ b/libraries/ui/src/main/res/values-mk/strings.xml @@ -46,7 +46,6 @@ Оневозможете ги титловите Овозможете ги титловите Брзина - Нормална 0,25 пати 0,5 пати diff --git a/libraries/ui/src/main/res/values-ml/strings.xml b/libraries/ui/src/main/res/values-ml/strings.xml index 45e797b15a..12de370917 100644 --- a/libraries/ui/src/main/res/values-ml/strings.xml +++ b/libraries/ui/src/main/res/values-ml/strings.xml @@ -46,7 +46,6 @@ സബ്‌ടൈറ്റിലുകൾ പ്രവർത്തനരഹിതമാക്കുക സബ്‌ടൈറ്റിലുകൾ പ്രവർത്തനക്ഷമമാക്കുക വേഗത - സാധാരണം 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-mn/strings.xml b/libraries/ui/src/main/res/values-mn/strings.xml index ad1262f84f..e9fbf7fe53 100644 --- a/libraries/ui/src/main/res/values-mn/strings.xml +++ b/libraries/ui/src/main/res/values-mn/strings.xml @@ -46,7 +46,6 @@ Хадмалыг идэвхгүй болгох Хадмалыг идэвхжүүлэх Хурд - Хэвийн 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-mr/strings.xml b/libraries/ui/src/main/res/values-mr/strings.xml index 65373db366..5641af2a47 100644 --- a/libraries/ui/src/main/res/values-mr/strings.xml +++ b/libraries/ui/src/main/res/values-mr/strings.xml @@ -46,7 +46,6 @@ सबटायटल बंद करा सबटायटल सुरू करा वेग - सामान्य ०.२५x ०.५x diff --git a/libraries/ui/src/main/res/values-ms/strings.xml b/libraries/ui/src/main/res/values-ms/strings.xml index e347882513..60cce968c2 100644 --- a/libraries/ui/src/main/res/values-ms/strings.xml +++ b/libraries/ui/src/main/res/values-ms/strings.xml @@ -46,7 +46,6 @@ Lumpuhkan sari kata Dayakan sari kata Kelajuan - Biasa 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-my/strings.xml b/libraries/ui/src/main/res/values-my/strings.xml index 4eaf042942..07f0ad05ff 100644 --- a/libraries/ui/src/main/res/values-my/strings.xml +++ b/libraries/ui/src/main/res/values-my/strings.xml @@ -46,7 +46,6 @@ စာတန်းထိုး ပိတ်ပါ စာတန်းထိုး ဖွင့်ပါ မြန်နှုန်း - ပုံမှန် ၀.၂၅ ဆ ၀.၅ ဆ diff --git a/libraries/ui/src/main/res/values-nb/strings.xml b/libraries/ui/src/main/res/values-nb/strings.xml index e77e25ec25..03a2216962 100644 --- a/libraries/ui/src/main/res/values-nb/strings.xml +++ b/libraries/ui/src/main/res/values-nb/strings.xml @@ -46,7 +46,6 @@ Slå av undertekstene Slå på undertekstene Hastighet - Normal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-ne/strings.xml b/libraries/ui/src/main/res/values-ne/strings.xml index 52aa9bbda9..2806463f0b 100644 --- a/libraries/ui/src/main/res/values-ne/strings.xml +++ b/libraries/ui/src/main/res/values-ne/strings.xml @@ -46,7 +46,6 @@ सबटाइटलहरू असक्षम पार्नुहोस् सबटाइटलहरू सक्षम पार्नुहोस् गति - सामान्य ०.२५ गुणा ०.५ गुणा diff --git a/libraries/ui/src/main/res/values-nl/strings.xml b/libraries/ui/src/main/res/values-nl/strings.xml index e5bbc6d4f6..0b7c590443 100644 --- a/libraries/ui/src/main/res/values-nl/strings.xml +++ b/libraries/ui/src/main/res/values-nl/strings.xml @@ -46,7 +46,6 @@ Ondertiteling uitzetten Ondertiteling aanzetten Snelheid - Normaal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-pa/strings.xml b/libraries/ui/src/main/res/values-pa/strings.xml index 3a5c6971a7..efe5b908ab 100644 --- a/libraries/ui/src/main/res/values-pa/strings.xml +++ b/libraries/ui/src/main/res/values-pa/strings.xml @@ -46,7 +46,6 @@ ਉਪਸਿਰਲੇਖਾਂ ਨੂੰ ਬੰਦ ਕਰੋ ਉਪਸਿਰਲੇਖਾਂ ਨੂੰ ਚਾਲੂ ਕਰੋ ਗਤੀ - ਸਧਾਰਨ 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-pl/strings.xml b/libraries/ui/src/main/res/values-pl/strings.xml index 72f72a4d24..f12915791b 100644 --- a/libraries/ui/src/main/res/values-pl/strings.xml +++ b/libraries/ui/src/main/res/values-pl/strings.xml @@ -50,7 +50,6 @@ Wyłącz napisy Włącz napisy Szybkość - Normalna 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-pt-rPT/strings.xml b/libraries/ui/src/main/res/values-pt-rPT/strings.xml index fa44fac8ce..f791718436 100644 --- a/libraries/ui/src/main/res/values-pt-rPT/strings.xml +++ b/libraries/ui/src/main/res/values-pt-rPT/strings.xml @@ -46,7 +46,6 @@ Desativar legendas Ativar legendas Velocidade - Normal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-pt/strings.xml b/libraries/ui/src/main/res/values-pt/strings.xml index ec3a718163..af04650a35 100644 --- a/libraries/ui/src/main/res/values-pt/strings.xml +++ b/libraries/ui/src/main/res/values-pt/strings.xml @@ -46,7 +46,6 @@ Desativar legendas Ativar legendas Velocidade - Normal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-ro/strings.xml b/libraries/ui/src/main/res/values-ro/strings.xml index 3b0d0e5353..db77aa55d1 100644 --- a/libraries/ui/src/main/res/values-ro/strings.xml +++ b/libraries/ui/src/main/res/values-ro/strings.xml @@ -48,7 +48,6 @@ Dezactivați subtitrările Activați subtitrările Viteză - Normală 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-ru/strings.xml b/libraries/ui/src/main/res/values-ru/strings.xml index 9246aef120..542517da8b 100644 --- a/libraries/ui/src/main/res/values-ru/strings.xml +++ b/libraries/ui/src/main/res/values-ru/strings.xml @@ -50,7 +50,6 @@ Выключить субтитры Включить субтитры Скорость - Стандартная 0,25 0,5 diff --git a/libraries/ui/src/main/res/values-si/strings.xml b/libraries/ui/src/main/res/values-si/strings.xml index 91449e45f5..2f56ca1699 100644 --- a/libraries/ui/src/main/res/values-si/strings.xml +++ b/libraries/ui/src/main/res/values-si/strings.xml @@ -46,7 +46,6 @@ උපසිරැසි අබල කරන්න උපසිරැසි සබල කරන්න වේගය - සාමාන්‍ය 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-sk/strings.xml b/libraries/ui/src/main/res/values-sk/strings.xml index 1f10b4632f..4f365fb034 100644 --- a/libraries/ui/src/main/res/values-sk/strings.xml +++ b/libraries/ui/src/main/res/values-sk/strings.xml @@ -50,7 +50,6 @@ Zakázať titulky Povoliť titulky Rýchlosť - Normálna 0,25 × 0,5 × diff --git a/libraries/ui/src/main/res/values-sl/strings.xml b/libraries/ui/src/main/res/values-sl/strings.xml index 785837aae4..1ddc0ba757 100644 --- a/libraries/ui/src/main/res/values-sl/strings.xml +++ b/libraries/ui/src/main/res/values-sl/strings.xml @@ -50,7 +50,6 @@ Onemogočanje podnapisov Omogočanje podnapisov Hitrost - Običajna 0,25-kratna 0,5-kratna diff --git a/libraries/ui/src/main/res/values-sq/strings.xml b/libraries/ui/src/main/res/values-sq/strings.xml index 12ebfc8d61..59941e5e8e 100644 --- a/libraries/ui/src/main/res/values-sq/strings.xml +++ b/libraries/ui/src/main/res/values-sq/strings.xml @@ -46,7 +46,6 @@ Çaktivizo titrat Aktivizo titrat Shpejtësia - Normale 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-sr/strings.xml b/libraries/ui/src/main/res/values-sr/strings.xml index a5ff832bc4..c748764e9b 100644 --- a/libraries/ui/src/main/res/values-sr/strings.xml +++ b/libraries/ui/src/main/res/values-sr/strings.xml @@ -48,7 +48,6 @@ Онемогући титлове Омогући титлове Брзина - Уобичајена 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-sv/strings.xml b/libraries/ui/src/main/res/values-sv/strings.xml index 0ecf222ba6..bb23c56b56 100644 --- a/libraries/ui/src/main/res/values-sv/strings.xml +++ b/libraries/ui/src/main/res/values-sv/strings.xml @@ -46,7 +46,6 @@ Inaktivera undertexter Aktivera undertexter Hastighet - Normal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-sw/strings.xml b/libraries/ui/src/main/res/values-sw/strings.xml index aff3bdb963..c594838faf 100644 --- a/libraries/ui/src/main/res/values-sw/strings.xml +++ b/libraries/ui/src/main/res/values-sw/strings.xml @@ -46,7 +46,6 @@ Zima manukuu Washa manukuu Kasi - Kawaida 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-ta/strings.xml b/libraries/ui/src/main/res/values-ta/strings.xml index 505af6e086..d107f42a10 100644 --- a/libraries/ui/src/main/res/values-ta/strings.xml +++ b/libraries/ui/src/main/res/values-ta/strings.xml @@ -46,7 +46,6 @@ வசனங்களை முடக்கும் வசனங்களை இயக்கும் வேகம் - இயல்பு 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-te/strings.xml b/libraries/ui/src/main/res/values-te/strings.xml index c446963dd0..435128311e 100644 --- a/libraries/ui/src/main/res/values-te/strings.xml +++ b/libraries/ui/src/main/res/values-te/strings.xml @@ -46,7 +46,6 @@ ఉప శీర్షికలను డిజేబుల్ చేయి ఉప శీర్షికలను ఎనేబుల్ చేయి వేగం - సాధారణం 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-th/strings.xml b/libraries/ui/src/main/res/values-th/strings.xml index 4532759394..387e9fffe3 100644 --- a/libraries/ui/src/main/res/values-th/strings.xml +++ b/libraries/ui/src/main/res/values-th/strings.xml @@ -46,7 +46,6 @@ ปิดใช้คำบรรยาย เปิดใช้คำบรรยาย ความเร็ว - ปกติ 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-tl/strings.xml b/libraries/ui/src/main/res/values-tl/strings.xml index 7491056a1c..5715b393ac 100644 --- a/libraries/ui/src/main/res/values-tl/strings.xml +++ b/libraries/ui/src/main/res/values-tl/strings.xml @@ -46,7 +46,6 @@ I-disable ang mga subtitle I-enable ang mga subtitle Bilis - Normal 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-tr/strings.xml b/libraries/ui/src/main/res/values-tr/strings.xml index 26c252761f..f367f44bb2 100644 --- a/libraries/ui/src/main/res/values-tr/strings.xml +++ b/libraries/ui/src/main/res/values-tr/strings.xml @@ -46,7 +46,6 @@ Altyazıları devre dışı bırak Altyazıları etkinleştir Hız - Normal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-uk/strings.xml b/libraries/ui/src/main/res/values-uk/strings.xml index ee527af89f..f8f2c47064 100644 --- a/libraries/ui/src/main/res/values-uk/strings.xml +++ b/libraries/ui/src/main/res/values-uk/strings.xml @@ -50,7 +50,6 @@ Вимкнути субтитри Увімкнути субтитри Швидкість - Звичайна 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-ur/strings.xml b/libraries/ui/src/main/res/values-ur/strings.xml index 024ebe0995..f7b46d01f4 100644 --- a/libraries/ui/src/main/res/values-ur/strings.xml +++ b/libraries/ui/src/main/res/values-ur/strings.xml @@ -46,7 +46,6 @@ سب ٹائٹلز کو غیر فعال کریں سب ٹائٹلز کو فعال کریں رفتار - عام 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-uz/strings.xml b/libraries/ui/src/main/res/values-uz/strings.xml index 9e1e8592f1..f0c4677b9c 100644 --- a/libraries/ui/src/main/res/values-uz/strings.xml +++ b/libraries/ui/src/main/res/values-uz/strings.xml @@ -46,7 +46,6 @@ Taglavhalarni faolsizlantirish Taglavhalarni yoqish Tezlik - Normal 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-vi/strings.xml b/libraries/ui/src/main/res/values-vi/strings.xml index 6cc2189e54..290d96f167 100644 --- a/libraries/ui/src/main/res/values-vi/strings.xml +++ b/libraries/ui/src/main/res/values-vi/strings.xml @@ -46,7 +46,6 @@ Tắt phụ đề Bật phụ đề Tốc độ - Bình thường 0,25x 0,5x diff --git a/libraries/ui/src/main/res/values-zh-rCN/strings.xml b/libraries/ui/src/main/res/values-zh-rCN/strings.xml index bf7e1c7f97..436449df6d 100644 --- a/libraries/ui/src/main/res/values-zh-rCN/strings.xml +++ b/libraries/ui/src/main/res/values-zh-rCN/strings.xml @@ -46,7 +46,6 @@ 停用字幕 启用字幕 速度 - 正常 0.25 倍 0.5 倍 diff --git a/libraries/ui/src/main/res/values-zh-rHK/strings.xml b/libraries/ui/src/main/res/values-zh-rHK/strings.xml index 1bcedc49aa..4fe9ee9b41 100644 --- a/libraries/ui/src/main/res/values-zh-rHK/strings.xml +++ b/libraries/ui/src/main/res/values-zh-rHK/strings.xml @@ -46,7 +46,6 @@ 停用字幕 啟用字幕 速度 - 正常 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values-zh-rTW/strings.xml b/libraries/ui/src/main/res/values-zh-rTW/strings.xml index 7b9556b0af..591afff6b5 100644 --- a/libraries/ui/src/main/res/values-zh-rTW/strings.xml +++ b/libraries/ui/src/main/res/values-zh-rTW/strings.xml @@ -46,7 +46,6 @@ 停用字幕 (Subtitle) 啟用字幕 (Subtitle) 速度 - 正常 0.25 倍 0.5 倍 diff --git a/libraries/ui/src/main/res/values-zu/strings.xml b/libraries/ui/src/main/res/values-zu/strings.xml index 0288e99476..409adc0e70 100644 --- a/libraries/ui/src/main/res/values-zu/strings.xml +++ b/libraries/ui/src/main/res/values-zu/strings.xml @@ -46,7 +46,6 @@ Khubaza imibhalo engezansi Nika amandla imibhalo engezansi Isivinini - Ivamile 0.25x 0.5x diff --git a/libraries/ui/src/main/res/values/arrays.xml b/libraries/ui/src/main/res/values/arrays.xml deleted file mode 100644 index 8b326c3d4d..0000000000 --- a/libraries/ui/src/main/res/values/arrays.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - 25 - 50 - 75 - 100 - 125 - 150 - 200 - - - - 0.25x - 0.5x - 0.75x - @string/exo_controls_playback_speed_normal - 1.25x - 1.5x - 2x - - diff --git a/libraries/ui/src/main/res/values/strings.xml b/libraries/ui/src/main/res/values/strings.xml index c04899db4a..2b7a00d418 100644 --- a/libraries/ui/src/main/res/values/strings.xml +++ b/libraries/ui/src/main/res/values/strings.xml @@ -72,8 +72,7 @@ Enable subtitles Speed - - Normal + 0.25x @@ -84,6 +83,7 @@ 1.5x 2x + %1$.2fx