diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2017-04-09 21:18:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-09 21:18:42 +0200 |
| commit | f56b07b4cf92e7626db6a4ac83219861d130f815 (patch) | |
| tree | 1ab13c3e1ab3e8f5116b04af8fa8732ee8304b1f /app/src/main/java/de/danoeh/antennapod/preferences | |
| parent | a230b7d8214536a5e42d104685e694452f44a312 (diff) | |
| parent | 5cbf092f3bde5c185c1826a941909db5f2a32c7d (diff) | |
| download | AntennaPod-f56b07b4cf92e7626db6a4ac83219861d130f815.zip | |
Merge pull request #2130 from ericraymond/develop
Added preference settings to customize fastforward and rewind delta.
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/preferences')
| -rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index 7f1d3075f..7777af450 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -54,6 +54,7 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.AboutActivity; import de.danoeh.antennapod.activity.DirectoryChooserActivity; import de.danoeh.antennapod.activity.MainActivity; +import de.danoeh.antennapod.activity.MediaplayerActivity; import de.danoeh.antennapod.activity.PreferenceActivity; import de.danoeh.antennapod.activity.PreferenceActivityGingerbread; import de.danoeh.antennapod.activity.StatisticsActivity; @@ -96,6 +97,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc private static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir"; private static final String AUTO_DL_PREF_SCREEN = "prefAutoDownloadSettings"; private static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher"; + public static final String PREF_PLAYBACK_REWIND_DELTA_LAUNCHER = "prefPlaybackRewindDeltaLauncher"; + public static final String PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER = "prefPlaybackFastForwardDeltaLauncher"; private static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate"; private static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information"; private static final String PREF_GPODNET_SYNC = "pref_gpodnet_sync"; @@ -333,6 +336,16 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc VariableSpeedDialog.showDialog(activity); return true; }); + ui.findPreference(PreferenceController.PREF_PLAYBACK_REWIND_DELTA_LAUNCHER) + .setOnPreferenceClickListener(preference -> { + MediaplayerActivity.showSkipPreference(activity, MediaplayerActivity.SkipDirection.SKIP_REWIND); + return true; + }); + ui.findPreference(PreferenceController.PREF_PLAYBACK_FAST_FORWARD_DELTA_LAUNCHER) + .setOnPreferenceClickListener(preference -> { + MediaplayerActivity.showSkipPreference(activity, MediaplayerActivity.SkipDirection.SKIP_FORWARD); + return true; + }); ui.findPreference(PreferenceController.PREF_GPODNET_SETLOGIN_INFORMATION) .setOnPreferenceClickListener(preference -> { AuthenticationDialog dialog = new AuthenticationDialog(activity, @@ -701,7 +714,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc val = String.format(context.getString(R.string.pref_autoUpdateIntervallOrTime_at), timeOfDayStr); } else { - val = context.getString(R.string.pref_smart_mark_as_played_disabled); + val = context.getString(R.string.pref_smart_mark_as_played_disabled); // TODO: Is this a bug? Otherwise document why is this related to smart mark??? } } String summary = context.getString(R.string.pref_autoUpdateIntervallOrTime_sum) + "\n" |