Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a6b11b6 authored by Tony Mantler's avatar Tony Mantler
Browse files

Allow styled text in pref titles and summaries 

Also tidy whitespace

b/31372605

Change-Id: I4640c370bc7eb2c33deb2e76b152784505007216
parent bdff0542

core/java/android/preference/Preference.java

+212 −212
Original line number Diff line number Diff line
@@ -232,11 +232,11 @@ public class Preference implements Comparable<Preference> { 


                case com.android.internal.R.styleable.Preference_title:

                    mTitleRes = a.getResourceId(attr, 0);

                    mTitle = a.getString(attr);

                    mTitle = a.getText(attr);

                    break;



                case com.android.internal.R.styleable.Preference_summary:

                    mSummary = a.getString(attr);

                    mSummary = a.getText(attr);

                    break;



                case com.android.internal.R.styleable.Preference_order:

core/res/res/values/attrs.xml

+4 −2
Original line number Diff line number Diff line
@@ -6965,9 +6965,11 @@ i 
        <attr name="icon" />

        <!-- The key to store the Preference value. -->

        <attr name="key" format="string" />

        <!-- The title for the Preference in a PreferenceActivity screen. -->

        <!-- The title for the Preference. In API 25 and earlier, this value is read as a

         plain string with styling information stripped. -->

        <attr name="title" />

        <!-- The summary for the Preference in a PreferenceActivity screen. -->

        <!-- The summary for the Preference. In API 25 and earlier, this value is read as a

         plain string with styling information stripped. -->

        <attr name="summary" />

        <!-- The order for the Preference (lower values are to be ordered first). If this is not

             specified, the default ordering will be alphabetic. -->