From cdca63c4c7e9f23e36a58b2025facdc8dbc09708 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 5 May 2017 10:19:52 -0700 Subject: [PATCH] Remove summary template in sleep timeout setting. The template causes incorrect display in search, and it's not needded by anyone in code. Bug: 36101902 Test: rerun robotests Change-Id: Ib399e15c799e08d377b124e88eda0b8f13494ed3 --- res/xml/display_settings.xml | 2 +- .../src/com/android/settings/search/XmlParserUtilTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 9d4acb49558..b9ff7808bc6 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -53,7 +53,7 @@ diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java index 5b7efcd7349..e35eb10cbb6 100644 --- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java +++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java @@ -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); }