commit a86e3d70e336dede717f4d06cea35d6b3ebcf4d4
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 18 20:33:43 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 18 20:33:47 2017 +0000
tree 1b547e76fabbc4d550b6c7257f7a68de6a3f2607
parent bd9ee9f11d3be739c370a630470f94423c030eaa
parent ce58046673bfd18656fd94a6612a250f31036dce

Merge "Check if singleLineTitle attribute is set for the preference." into oc-dev

core/java/android/preference/Preference.java

diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java
index d3adce7..7496cb2 100644
--- a/core/java/android/preference/Preference.java
+++ b/core/java/android/preference/Preference.java
@@ -135,6 +135,7 @@
     private boolean mDependencyMet = true;
     private boolean mParentDependencyMet = true;
     private boolean mRecycleEnabled = true;
+    private boolean mHasSingleLineTitleAttr;
     private boolean mSingleLineTitle = true;
     private boolean mIconSpaceReserved;
 
@@ -303,6 +304,7 @@
 
                 case com.android.internal.R.styleable.Preference_singleLineTitle:
                     mSingleLineTitle = a.getBoolean(attr, mSingleLineTitle);
+                    mHasSingleLineTitleAttr = true;
                     break;
 
                 case com.android.internal.R.styleable.Preference_iconSpaceReserved:
@@ -609,7 +611,9 @@
             if (!TextUtils.isEmpty(title)) {
                 titleView.setText(title);
                 titleView.setVisibility(View.VISIBLE);
-                titleView.setSingleLine(mSingleLineTitle);
+                if (mHasSingleLineTitleAttr) {
+                    titleView.setSingleLine(mSingleLineTitle);
+                }
             } else {
                 titleView.setVisibility(View.GONE);
             }