diff options
| author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-10-16 07:50:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-16 07:50:58 +0200 |
| commit | b860ee33d0d5a3f0543697a3348bc1eb8f614965 (patch) | |
| tree | 902caa8e6da52f21f0fbc598989cc565b730c32c | |
| parent | 62eda1fc1b53cfc641ac02aac4715453973a976a (diff) | |
| parent | a93085a58d59b010c5c694f3cc808d3444000189 (diff) | |
| download | AntennaPod-b860ee33d0d5a3f0543697a3348bc1eb8f614965.zip | |
Merge pull request #5469 from ByteHamster/compact-notification-button-default
Use ff/rew as default notification buttons
| -rw-r--r-- | app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java | 5 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java index c71bff357..74414240f 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java @@ -126,8 +126,9 @@ public class PreferencesTest { clickPreference(R.string.user_interface_label); String[] buttons = res.getStringArray(R.array.compact_notification_buttons_options); clickPreference(R.string.pref_compact_notification_buttons_title); - // First uncheck checkbox - onView(withText(buttons[2])).perform(click()); + // First uncheck checkboxes + onView(withText(buttons[0])).perform(click()); + onView(withText(buttons[1])).perform(click()); // Now try to check all checkboxes onView(withText(buttons[0])).perform(click()); diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index dc90de901..4ff6527ab 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -207,7 +207,7 @@ public class UserPreferences { public static List<Integer> getCompactNotificationButtons() { String[] buttons = TextUtils.split( prefs.getString(PREF_COMPACT_NOTIFICATION_BUTTONS, - String.valueOf(NOTIFICATION_BUTTON_SKIP)), + NOTIFICATION_BUTTON_REWIND + "," + NOTIFICATION_BUTTON_FAST_FORWARD), ","); List<Integer> notificationButtons = new ArrayList<>(); for (String button : buttons) { |