aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2018-08-14 17:12:15 -0700
committerScott Jackson <daneren2005@gmail.com>2018-08-14 17:12:15 -0700
commit05bc7185cb6d35dfd6ea7b0c3aeaf977357e3b64 (patch)
tree5e422bb5e5b807b2aacb008914a882a81d2ef9dd /app
parent50583cec5ab2148209ea8b050712aa5f1878ed64 (diff)
downloaddsub-05bc7185cb6d35dfd6ea7b0c3aeaf977357e3b64.tar.gz
dsub-05bc7185cb6d35dfd6ea7b0c3aeaf977357e3b64.tar.bz2
dsub-05bc7185cb6d35dfd6ea7b0c3aeaf977357e3b64.zip
Fixes #875 lockscreen widget always fast forwarding instead of skipping
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/util/Notifications.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
index 428c33e0..f0bd6766 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
+++ b/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
@@ -216,13 +216,13 @@ public final class Notifications {
// Create actions for media buttons
int previous = 0, pause = 0, next = 0, close = 0, rewind = 0, fastForward = 0;
if (expanded) {
+ pause = R.id.control_pause;
+
if (shouldFastForward) {
rewind = R.id.control_previous;
- pause = R.id.control_pause;
fastForward = R.id.control_next;
} else {
previous = R.id.control_previous;
- pause = R.id.control_pause;
next = R.id.control_next;
}
@@ -240,9 +240,15 @@ public final class Notifications {
}
close = R.id.control_next;
} else {
- rewind = R.id.control_previous;
+ if (shouldFastForward) {
+ rewind = R.id.control_previous;
+ fastForward = R.id.control_next;
+ } else {
+ previous = R.id.control_previous;
+ next = R.id.control_next;
+ }
+
pause = R.id.control_pause;
- fastForward = R.id.control_next;
}
}