diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 885034e5a..e63e549a2 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -2013,10 +2013,10 @@ public final class VideoDetailFragment
restoreDefaultBrightness();
} else {
// Do not restore if user has disabled brightness gesture
- if (!(PlayerHelper.getRightSideGesture(activity)
- .equals(getString(R.string.right_brightness_control_key))
- && PlayerHelper.getLeftSideGesture(activity)
- .equals(getString(R.string.left_brightness_control_key)))) {
+ if (PlayerHelper.getRightSideGesture(activity)
+ .equals(getString(R.string.brightness_control_key))
+ || PlayerHelper.getLeftSideGesture(activity)
+ .equals(getString(R.string.brightness_control_key))) {
return;
}
// Restore already saved brightness level
diff --git a/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt b/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt
index 82cf2244c..ce78fcfe2 100644
--- a/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt
+++ b/app/src/main/java/org/schabi/newpipe/player/gesture/MainPlayerGestureListener.kt
@@ -198,16 +198,16 @@ class MainPlayerGestureListener(
if (getDisplayHalfPortion(initialEvent) == DisplayPortion.RIGHT_HALF) {
when (rightSide) {
- player.context.getString(R.string.right_volume_control_key) ->
+ player.context.getString(R.string.volume_control_key) ->
onScrollVolume(distanceY)
- player.context.getString(R.string.right_brightness_control_key) ->
+ player.context.getString(R.string.brightness_control_key) ->
onScrollBrightness(distanceY)
}
} else {
when (leftSide) {
- player.context.getString(R.string.left_volume_control_key) ->
+ player.context.getString(R.string.volume_control_key) ->
onScrollVolume(distanceY)
- player.context.getString(R.string.left_brightness_control_key) ->
+ player.context.getString(R.string.brightness_control_key) ->
onScrollBrightness(distanceY)
}
}
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index ad6b1777b..8f3e8e192 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -191,35 +191,32 @@
left_gesture_control
- @string/left_brightness_control_key
- left_brightness_control
- left_volume_control
- left_none_control
+ @string/brightness_control_key
+ brightness_control
+ volume_control
+ none_control
- @string/brightness
- @string/volume
- @string/none
- - @string/left_brightness_control_key
- - @string/left_volume_control_key
- - @string/left_none_control_key
+ - @string/brightness_control_key
+ - @string/volume_control_key
+ - @string/none_control_key
right_gesture_control
- @string/right_volume_control_key
- right_brightness_control
- right_volume_control
- right_none_control
+ @string/volume_control_key
- @string/volume
- @string/brightness
- @string/none
- - @string/right_volume_control_key
- - @string/right_brightness_control_key
- - @string/right_none_control_key
+ - @string/volume_control_key
+ - @string/brightness_control_key
+ - @string/none_control_key
last_resize_mode