Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-Android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Casanowow Life for love
VLC-Android
Commits
2abb3c9f
Commit
2abb3c9f
authored
May 22, 2017
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable current playlist auto scrolling on demand
parent
535a58f5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
+16
-3
No files found.
vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
View file @
2abb3c9f
...
...
@@ -102,6 +102,9 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
private
final
ConstraintSet
coverConstraintSet
=
AndroidUtil
.
isICSOrLater
?
new
ConstraintSet
()
:
null
;
private
final
ConstraintSet
playlistConstraintSet
=
AndroidUtil
.
isICSOrLater
?
new
ConstraintSet
()
:
null
;
SharedPreferences
mSettings
;
private
boolean
mAnimateScroll
;
// Tips
private
static
final
String
PREF_PLAYLIST_TIPS_SHOWN
=
"playlist_tips_shown"
;
private
static
final
String
PREF_AUDIOPLAYER_TIPS_SHOWN
=
"audioplayer_tips_shown"
;
...
...
@@ -149,6 +152,13 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
coverConstraintSet
.
setVisibility
(
R
.
id
.
songs_list
,
View
.
GONE
);
coverConstraintSet
.
setVisibility
(
R
.
id
.
cover_media_switcher
,
View
.
VISIBLE
);
}
mSettings
=
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
());
}
@Override
public
void
onStart
()
{
super
.
onStart
();
mAnimateScroll
=
mSettings
.
getBoolean
(
"animate_playlist_scroll"
,
true
);
}
public
void
onPopupMenu
(
View
anchor
,
final
int
position
)
{
...
...
@@ -201,7 +211,6 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
if
(
mService
==
null
||
getActivity
()
==
null
)
return
;
if
(
mService
.
hasMedia
()
&&
!
mService
.
isVideoPlaying
())
{
SharedPreferences
mSettings
=
PreferenceManager
.
getDefaultSharedPreferences
(
getActivity
());
//Check fragment resumed to not restore video on device turning off
if
(
isVisible
()
&&
mSettings
.
getBoolean
(
PreferencesActivity
.
VIDEO_RESTORE
,
false
))
{
mSettings
.
edit
().
putBoolean
(
PreferencesActivity
.
VIDEO_RESTORE
,
false
).
apply
();
...
...
@@ -343,8 +352,12 @@ public class AudioPlayer extends PlaybackServiceFragment implements PlaybackServ
@Override
public
void
onSelectionSet
(
int
position
)
{
if
(
mPlayerState
!=
BottomSheetBehavior
.
STATE_COLLAPSED
&&
mPlayerState
!=
BottomSheetBehavior
.
STATE_HIDDEN
)
mBinding
.
songsList
.
smoothScrollToPosition
(
position
);
if
(
mPlayerState
!=
BottomSheetBehavior
.
STATE_COLLAPSED
&&
mPlayerState
!=
BottomSheetBehavior
.
STATE_HIDDEN
)
{
if
(
mAnimateScroll
)
mBinding
.
songsList
.
smoothScrollToPosition
(
position
);
else
mBinding
.
songsList
.
scrollToPosition
(
position
);
}
}
OnSeekBarChangeListener
mTimelineListner
=
new
OnSeekBarChangeListener
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment