PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 014ff46fa6

Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845
This commit is contained in:
Fan Zhang
2017-05-08 19:08:20 +00:00
committed by android-build-merger
parent bf3ad99a38 014ff46fa6
commit f7ba1e7209
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/display_settings.xml
View File

@@ -53,7 +53,7 @@
<com.android.settings.TimeoutListPreference <com.android.settings.TimeoutListPreference
android:key="screen_timeout" android:key="screen_timeout"
android:title="@string/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:entries="@array/screen_timeout_entries"
android:entryValues="@array/screen_timeout_values" /> android:entryValues="@array/screen_timeout_values" />

2
tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
View File

@@ -89,7 +89,7 @@ public class XmlParserUtilTest {
"com.android.settings.TimeoutListPreference"); "com.android.settings.TimeoutListPreference");
final AttributeSet attrs = Xml.asAttributeSet(parser); final AttributeSet attrs = Xml.asAttributeSet(parser);
String summary = XmlParserUtils.getDataSummary(mContext, attrs); 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); assertThat(summary).isEqualTo(expSummary);
} }