Merge branch 'develop' into dependabot/gradle/org.jacoco-org.jacoco.core-0.8.7
This commit is contained in:
commit
115b8c3183
|
@ -34,13 +34,13 @@ ext.versions = [
|
||||||
|
|
||||||
junit4 : "4.12",
|
junit4 : "4.12",
|
||||||
junit5 : "5.3.1",
|
junit5 : "5.3.1",
|
||||||
mockito : "3.5.5",
|
mockito : "3.8.0",
|
||||||
mockitoKotlin : "1.5.0",
|
mockitoKotlin : "1.5.0",
|
||||||
kluent : "1.35",
|
kluent : "1.35",
|
||||||
apacheCodecs : "1.10",
|
apacheCodecs : "1.10",
|
||||||
testRunner : "1.0.1",
|
testRunner : "1.0.1",
|
||||||
robolectric : "4.4",
|
robolectric : "4.4",
|
||||||
dexter : "6.1.2",
|
dexter : "6.2.2",
|
||||||
timber : "4.7.1",
|
timber : "4.7.1",
|
||||||
fastScroll : "2.0.1",
|
fastScroll : "2.0.1",
|
||||||
]
|
]
|
||||||
|
|
|
@ -447,6 +447,8 @@ public class SettingsFragment extends PreferenceFragmentCompat
|
||||||
sharingDefaultExpiration.setSummary(sharingDefaultExpiration.getText());
|
sharingDefaultExpiration.setSummary(sharingDefaultExpiration.getText());
|
||||||
sharingDefaultDescription.setSummary(sharingDefaultDescription.getText());
|
sharingDefaultDescription.setSummary(sharingDefaultDescription.getText());
|
||||||
sharingDefaultGreeting.setSummary(sharingDefaultGreeting.getText());
|
sharingDefaultGreeting.setSummary(sharingDefaultGreeting.getText());
|
||||||
|
cacheLocation.setSummary(settings.getString(Constants.PREFERENCES_KEY_CACHE_LOCATION,
|
||||||
|
FileUtil.getDefaultMusicDirectory(getActivity()).getPath()));
|
||||||
|
|
||||||
if (!mediaButtonsEnabled.isChecked()) {
|
if (!mediaButtonsEnabled.isChecked()) {
|
||||||
lockScreenEnabled.setChecked(false);
|
lockScreenEnabled.setChecked(false);
|
||||||
|
|
Loading…
Reference in New Issue