From e7075936fd1c2e4e7ceb388b89913373ff54f19b Mon Sep 17 00:00:00 2001 From: Xiao Bao Clark Date: Sat, 22 Aug 2015 10:17:18 +1000 Subject: [PATCH] Added performAction in PlaybackActivity. Made performAction in FullPlaybackActivity override it. This fixes the bug #44 where swipe up/down was not toggling controls when that preference was set --- .../android/vanilla/FullPlaybackActivity.java | 5 +++-- .../blinkenlights/android/vanilla/PlaybackActivity.java | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java index 85a74447..a1366e3c 100644 --- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java +++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java @@ -710,13 +710,14 @@ public class FullPlaybackActivity extends PlaybackActivity mSeekBarTracking = false; } - public void performAction(Action action) + @Override + protected void performAction(Action action) { if (action == Action.ToggleControls) { setControlsVisible(!mControlsVisible); mHandler.sendEmptyMessage(MSG_SAVE_CONTROLS); } else { - PlaybackService.get(this).performAction(action, this); + super.performAction(action); } } diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java index 54bda519..736abf83 100644 --- a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java +++ b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java @@ -540,13 +540,18 @@ public abstract class PlaybackActivity extends Activity @Override public void upSwipe() { - PlaybackService.get(this).performAction(mUpAction, this); + performAction(mUpAction); } @Override public void downSwipe() { - PlaybackService.get(this).performAction(mDownAction, this); + performAction(mDownAction); + } + + protected void performAction(Action action) + { + PlaybackService.get(this).performAction(action, this); } private static final int GROUP_SHUFFLE = 100;