diff --git a/build.gradle b/build.gradle index d687fdf816..4383f99486 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,6 @@ dependencies { exclude module: 'support-v4' } compile 'com.squareup.dagger:dagger:1.2.2' - compile 'com.doomonafireball.betterpickers:library:1.5.2' compile ("com.doomonafireball.betterpickers:library:1.5.2") { exclude group: 'com.android.support', module: 'support-v4' } diff --git a/res/values/strings.xml b/res/values/strings.xml index 3bfaac18cb..396a8f0dc6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -42,6 +42,9 @@ Incoming outgoing + + %d minutes + (image) (audio) diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java index b6ea439611..69f9a3b4c0 100644 --- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java @@ -69,7 +69,7 @@ public class AppProtectionPreferenceFragment extends PreferenceFragment { private void initializeTimeoutSummary() { int timeoutMinutes = TextSecurePreferences.getPassphraseTimeoutInterval(getActivity()); this.findPreference(TextSecurePreferences.PASSPHRASE_TIMEOUT_INTERVAL_PREF) - .setSummary(String.format("%d minutes", timeoutMinutes)); + .setSummary(getString(R.string.AppProtectionPreferenceFragment_minutes, timeoutMinutes)); } private class ChangePassphraseClickListener implements Preference.OnPreferenceClickListener {