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

Commit 8b422ba4 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Remove summary template in sleep timeout setting." into oc-dev am: 014ff46f 

am: f7ba1e72

Change-Id: I867a5237475be372bcc183b038c9539a3c4a8087
parents 77590cd1 f7ba1e72

res/xml/display_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
    <com.android.settings.TimeoutListPreference

        android:key="screen_timeout"

        android:title="@string/screen_timeout"

        android:summary="@string/screen_timeout_summary"

        android:summary="@string/summary_placeholder"

        android:entries="@array/screen_timeout_entries"

        android:entryValues="@array/screen_timeout_values" />

tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class XmlParserUtilTest { 
                "com.android.settings.TimeoutListPreference");

        final AttributeSet attrs = Xml.asAttributeSet(parser);

        String summary = XmlParserUtils.getDataSummary(mContext, attrs);

        String expSummary = mContext.getString(R.string.screen_timeout_summary);

        String expSummary = mContext.getString(R.string.summary_placeholder);

        assertThat(summary).isEqualTo(expSummary);



    }