Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
530
Issue boards
Milestones
Wiki
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
ade88e1e
Commit
ade88e1e
authored
1 year ago
by
Duncan McNamara
Committed by
Nicolas Pomepuy
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Typo: "Controls Settings" to "Control Settings"
parent
b712ab39
No related branches found
No related tags found
1 merge request
!1744
Typo: "Controls Settings" to "Control Settings"
Pipeline
#352601
passed with stage
in 9 minutes and 2 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
application/resources/src/main/res/values/strings.xml
+2
-1
2 additions, 1 deletion
application/resources/src/main/res/values/strings.xml
application/vlc-android/src/org/videolan/vlc/gui/helpers/PlayerOptionsDelegate.kt
+6
-6
6 additions, 6 deletions
...src/org/videolan/vlc/gui/helpers/PlayerOptionsDelegate.kt
with
8 additions
and
7 deletions
application/resources/src/main/res/values/strings.xml
+
2
−
1
View file @
ade88e1e
...
...
@@ -1006,7 +1006,8 @@
<string
name=
"permission"
>
Permission
</string>
<string
name=
"customize"
>
Customize
</string>
<string
name=
"selection_count"
>
%d selected
</string>
<string
name=
"controls_setting"
>
Controls settings
</string>
<string
name=
"control_setting"
>
Control settings
</string>
<string
name=
"controls_setting"
>
Controls settings
</string>
<!-- Unused -->
<string
name=
"gestures"
>
Gestures
</string>
<string
name=
"player_controls"
>
Player controls
</string>
<string
name=
"video_double_tap_jump_delay"
>
Double tap time delay
</string>
...
...
This diff is collapsed.
Click to expand it.
application/vlc-android/src/org/videolan/vlc/gui/helpers/PlayerOptionsDelegate.kt
+
6
−
6
View file @
ade88e1e
...
...
@@ -63,8 +63,8 @@ private const val ID_VIDEO_STATS = 15L
private
const
val
ID_SHOW_VIDEO_TIPS
=
16L
private
const
val
ID_SHOW_AUDIO_TIPS
=
17L
private
const
val
ID_SHOW_PLAYLIST_TIPS
=
18L
private
const
val
ID_VIDEO_CONTROL
S
_SETTING
=
19L
private
const
val
ID_AUDIO_CONTROL
S
_SETTING
=
20L
private
const
val
ID_VIDEO_CONTROL_SETTING
=
19L
private
const
val
ID_AUDIO_CONTROL_SETTING
=
20L
@SuppressLint
(
"ShowToast"
)
class
PlayerOptionsDelegate
(
val
activity
:
FragmentActivity
,
val
service
:
PlaybackService
,
private
val
showABReapeat
:
Boolean
=
true
)
:
LifecycleObserver
{
...
...
@@ -113,13 +113,13 @@ class PlayerOptionsDelegate(val activity: FragmentActivity, val service: Playbac
if
(
service
.
playlistManager
.
player
.
canDoPassthrough
()
&&
settings
.
getString
(
"aout"
,
"0"
)
!=
"2"
)
options
.
add
(
PlayerOption
(
ID_PASSTHROUGH
,
R
.
drawable
.
ic_passthrough
,
res
.
getString
(
R
.
string
.
audio_digital_title
)))
if
(
video
)
options
.
add
(
PlayerOption
(
ID_VIDEO_CONTROL
S
_SETTING
,
R
.
drawable
.
ic_video_controls
,
res
.
getString
(
R
.
string
.
control
s
_setting
)))
options
.
add
(
PlayerOption
(
ID_VIDEO_CONTROL_SETTING
,
R
.
drawable
.
ic_video_controls
,
res
.
getString
(
R
.
string
.
control_setting
)))
if
(!
Settings
.
showTvUi
)
{
if
(
video
)
{
options
.
add
(
PlayerOption
(
ID_SHOW_VIDEO_TIPS
,
R
.
drawable
.
ic_videotips
,
res
.
getString
(
R
.
string
.
tips_title
)))
}
else
{
options
.
add
(
PlayerOption
(
ID_AUDIO_CONTROL
S
_SETTING
,
R
.
drawable
.
ic_audio_controls
,
res
.
getString
(
R
.
string
.
control
s
_setting
)))
options
.
add
(
PlayerOption
(
ID_AUDIO_CONTROL_SETTING
,
R
.
drawable
.
ic_audio_controls
,
res
.
getString
(
R
.
string
.
control_setting
)))
options
.
add
(
PlayerOption
(
ID_SHOW_AUDIO_TIPS
,
R
.
drawable
.
ic_audiotips
,
res
.
getString
(
R
.
string
.
audio_player_tips
)))
options
.
add
(
PlayerOption
(
ID_SHOW_PLAYLIST_TIPS
,
R
.
drawable
.
ic_playlisttips
,
res
.
getString
(
R
.
string
.
playlist_tips
)))
}
...
...
@@ -235,12 +235,12 @@ class PlayerOptionsDelegate(val activity: FragmentActivity, val service: Playbac
hide
()
bookmarkClickedListener
.
invoke
()
}
ID_VIDEO_CONTROL
S
_SETTING
->
{
ID_VIDEO_CONTROL_SETTING
->
{
hide
()
val
videoControlsSettingsDialog
=
VideoControlsSettingsDialog
()
videoControlsSettingsDialog
.
show
(
activity
.
supportFragmentManager
,
"fragment_video_controls_settings"
)
}
ID_AUDIO_CONTROL
S
_SETTING
->
{
ID_AUDIO_CONTROL_SETTING
->
{
hide
()
val
audioControlsSettingsDialog
=
AudioControlsSettingsDialog
()
audioControlsSettingsDialog
.
show
(
activity
.
supportFragmentManager
,
"fragment_audio_controls_settings"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment