diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-08 03:37:45 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-08 03:37:45 +0000 |
commit | f003be12e0b56970196b2d665417ce0c35b86b96 (patch) | |
tree | 4b3051b1d9a3feab5b5f4dd92918050e86d84eba | |
parent | 4d4dd9cdf3ddde0c1fdcde4572019e225f0adaa0 (diff) | |
parent | b383eab1662b92bcd396a007221719af029f7845 (diff) |
Merge "Basic settings for SpeakEasy"
-rw-r--r-- | java/com/android/dialer/widget/TextViewPreference.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/com/android/dialer/widget/TextViewPreference.java b/java/com/android/dialer/widget/TextViewPreference.java index 2c1885c4d..1c479d404 100644 --- a/java/com/android/dialer/widget/TextViewPreference.java +++ b/java/com/android/dialer/widget/TextViewPreference.java @@ -108,6 +108,8 @@ public class TextViewPreference extends Preference { setTitle(textResourceId); } else if (text != null) { setTitle(text); + } else if (getTitleRes() != 0) { + setTitle(getTitleRes()); } } |