Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
Issue boards
Milestones
Wiki
Code
Merge requests
12
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
bbb8e5c4
Commit
bbb8e5c4
authored
5 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Code cleaning
parent
ec94693b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#7384
passed with stage
in 3 minutes and 50 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt
+1
-1
1 addition, 1 deletion
.../src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt
vlc-android/src/org/videolan/vlc/gui/MainActivity.kt
+1
-1
1 addition, 1 deletion
vlc-android/src/org/videolan/vlc/gui/MainActivity.kt
with
2 additions
and
2 deletions
vlc-android/src/org/videolan/vlc/gui/AudioPlayerContainerActivity.kt
+
1
−
1
View file @
bbb8e5c4
...
...
@@ -248,7 +248,7 @@ open class AudioPlayerContainerActivity : BaseActivity() {
* @return true on success else false.
*/
fun
slideDownAudioPlayer
():
Boolean
{
if
(
isAudioPlayerReady
&&
bottomSheetBehavior
!!
.
state
==
STATE_EXPANDED
)
{
if
(
isAudioPlayerReady
&&
bottomSheetBehavior
?
.
state
==
STATE_EXPANDED
)
{
bottomSheetBehavior
?.
state
=
STATE_COLLAPSED
return
true
}
...
...
This diff is collapsed.
Click to expand it.
vlc-android/src/org/videolan/vlc/gui/MainActivity.kt
+
1
−
1
View file @
bbb8e5c4
...
...
@@ -251,7 +251,7 @@ class MainActivity : ContentActivity(), ExtensionManagerService.ExtensionManager
}
/* Close playlist search if open or Slide down the audio player if it is shown entirely. */
if
(
isAudioPlayerReady
&&
(
audioPlayer
!!
.
backPressed
()
||
slideDownAudioPlayer
()))
if
(
isAudioPlayerReady
&&
(
audioPlayer
?
.
backPressed
()
==
true
||
slideDownAudioPlayer
()))
return
// If it's the directory view, a "backpressed" action shows a parent.
...
...
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