diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
index 97652ad01f..8bb9babeb0 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlView.java
@@ -1159,13 +1159,14 @@ public class StyledPlayerControlView extends FrameLayout {
if (controlDispatcher instanceof DefaultControlDispatcher) {
rewindMs = ((DefaultControlDispatcher) controlDispatcher).getRewindIncrementMs();
}
- long rewindSec = rewindMs / 1_000;
+ int rewindSec = (int) (rewindMs / 1_000);
if (rewindButtonTextView != null) {
rewindButtonTextView.setText(String.valueOf(rewindSec));
}
if (rewindButton != null) {
rewindButton.setContentDescription(
- resources.getString(R.string.exo_controls_rewind_by_amount_description, rewindSec));
+ resources.getQuantityString(
+ R.plurals.exo_controls_rewind_by_amount_description, rewindSec, rewindSec));
}
}
@@ -1173,14 +1174,16 @@ public class StyledPlayerControlView extends FrameLayout {
if (controlDispatcher instanceof DefaultControlDispatcher) {
fastForwardMs = ((DefaultControlDispatcher) controlDispatcher).getFastForwardIncrementMs();
}
- long fastForwardSec = fastForwardMs / 1_000;
+ int fastForwardSec = (int) (fastForwardMs / 1_000);
if (fastForwardButtonTextView != null) {
fastForwardButtonTextView.setText(String.valueOf(fastForwardSec));
}
if (fastForwardButton != null) {
fastForwardButton.setContentDescription(
- resources.getString(
- R.string.exo_controls_fastforward_by_amount_description, fastForwardSec));
+ resources.getQuantityString(
+ R.plurals.exo_controls_fastforward_by_amount_description,
+ fastForwardSec,
+ fastForwardSec));
}
}
diff --git a/library/ui/src/main/res/values/strings.xml b/library/ui/src/main/res/values/strings.xml
index a65d81e2b1..a11d04073f 100644
--- a/library/ui/src/main/res/values/strings.xml
+++ b/library/ui/src/main/res/values/strings.xml
@@ -43,11 +43,17 @@
Rewind
- Rewind %d seconds
+
+ - Rewind %d second
+ - Rewind %d seconds
+
Fast forward
- Fast forward %d seconds
+
+ - Fast forward %d second
+ - Fast forward %d seconds
+
Repeat none
diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
index 76ea27ef5a..f903441698 100644
--- a/library/ui/src/main/res/values/styles.xml
+++ b/library/ui/src/main/res/values/styles.xml
@@ -90,14 +90,12 @@