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

Commit 014ff46f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove summary template in sleep timeout setting." into oc-dev

parents 0560127e cdca63c4

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);



    }