k1rakishou 835476870b Merge remote-tracking branch 'push_here/(#1570)-lock-screen-video-thumbnail' into (#1570)-lock-screen-video-thumbnail ... # Conflicts: # app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java # app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java # app/src/main/java/org/schabi/newpipe/util/BitmapUtils.java # app/src/main/res/xml/video_audio_settings.xml		2020-01-03 12:56:01 +03:00
..
AudioReactor.java	Migrate to AndroidX	2019-10-04 14:59:08 +02:00
CacheFactory.java	Fixed deprecations	2019-10-07 11:18:26 +02:00
LoadController.java	Update ExoPlayer to 2.9.6, including httook dependency and deprecations	2019-03-05 18:05:44 +01:00
LockManager.java	…
MediaSessionManager.java	Merge remote-tracking branch 'push_here/(#1570)-lock-screen-video-thumbnail' into (#1570)-lock-screen-video-thumbnail	2020-01-03 12:56:01 +03:00
PlaybackParameterDialog.java	Migrate to AndroidX	2019-10-04 14:59:08 +02:00
PlayerDataSource.java	Fixed deprecations	2019-10-07 11:18:26 +02:00
PlayerHelper.java	Migrate to AndroidX	2019-10-04 14:59:08 +02:00