diff options
author | Tom Hennen <tom.hennen@gmail.com> | 2015-10-31 11:33:10 -0400 |
---|---|---|
committer | Tom Hennen <tom.hennen@gmail.com> | 2015-10-31 11:33:10 -0400 |
commit | 3cc5eee0ff2d5eb650a71c78235229422322a3a6 (patch) | |
tree | b32434645711b09be9b6ce85adcd0a0df1e74b29 /app | |
parent | fe0bc61c7e46560ea982337c6537336dfb29a253 (diff) | |
download | AntennaPod-3cc5eee0ff2d5eb650a71c78235229422322a3a6.zip |
Have a different option for bluetooth reconnect.
Vibrate when starting playback due to bluetooth reconnect.
fixes AntennaPod/AntennaPod#1305
Diffstat (limited to 'app')
-rw-r--r-- | app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java | 12 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences.xml | 9 |
2 files changed, 20 insertions, 1 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 8de4ba3c8..fabc399ba 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java @@ -125,6 +125,18 @@ public class PreferencesTest extends ActivityInstrumentationTestCase2<Preference assertTrue(solo.waitForCondition(() -> unpauseOnHeadsetReconnect == UserPreferences.isUnpauseOnHeadsetReconnect(), Timeout.getLargeTimeout())); } + public void testBluetoothReconnect() { + if(UserPreferences.isPauseOnHeadsetDisconnect() == false) { + solo.clickOnText(solo.getString(R.string.pref_pauseOnHeadsetDisconnect_title)); + assertTrue(solo.waitForCondition(() -> UserPreferences.isPauseOnHeadsetDisconnect(), Timeout.getLargeTimeout())); + } + final boolean unpauseOnBluetoothReconnect = UserPreferences.isUnpauseOnBluetoothReconnect(); + solo.clickOnText(solo.getString(R.string.pref_unpauseOnBluetoothReconnect_title)); + assertTrue(solo.waitForCondition(() -> unpauseOnBluetoothReconnect != UserPreferences.isUnpauseOnBluetoothReconnect(), Timeout.getLargeTimeout())); + solo.clickOnText(solo.getString(R.string.pref_unpauseOnBluetoothReconnect_title)); + assertTrue(solo.waitForCondition(() -> unpauseOnBluetoothReconnect == UserPreferences.isUnpauseOnBluetoothReconnect(), Timeout.getLargeTimeout())); + } + public void testContinuousPlayback() { final boolean continuousPlayback = UserPreferences.isFollowQueue(); solo.clickOnText(solo.getString(R.string.pref_followQueue_title)); diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8d507663a..bc020fb36 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -73,7 +73,7 @@ android:defaultValue="true" android:enabled="true" android:key="prefPauseOnHeadsetDisconnect" - android:summary="@string/pref_pauseOnHeadsetDisconnect_sum" + android:summary="@string/pref_pauseOnDisconnect_sum" android:title="@string/pref_pauseOnHeadsetDisconnect_title"/> <CheckBoxPreference android:defaultValue="true" @@ -83,6 +83,13 @@ android:summary="@string/pref_unpauseOnHeadsetReconnect_sum" android:title="@string/pref_unpauseOnHeadsetReconnect_title"/> <CheckBoxPreference + android:defaultValue="false" + android:enabled="true" + android:dependency="prefPauseOnHeadsetDisconnect" + android:key="prefUnpauseOnBluetoothReconnect" + android:summary="@string/pref_unpauseOnBluetoothReconnect_sum" + android:title="@string/pref_unpauseOnBluetoothReconnect_title"/> + <CheckBoxPreference android:defaultValue="true" android:enabled="true" android:key="prefFollowQueue" |