Merge pull request #320 from svramusi/master

Tested and merged, thanks @svramusi !
12 years ago · 27fadf70f0
parent f58f79a459 45f4faaf4c
commit 27fadf70f0
1 changed files with 0 additions and 2 deletions
--- a/src/org/thoughtcrime/securesms/preferences/PassphraseTimeoutPreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/PassphraseTimeoutPreference.java
@ -60,8 +60,6 @@ public class PassphraseTimeoutPreference extends DialogPreference {
    // Can't figure out how to style a DialogPreference.
    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
      this.timeoutText.setTextColor(Color.parseColor("#cccccc"));
-    } else {
-      this.timeoutText.setTextColor(Color.parseColor("#000000"));
    }

    initializeDefaults();