Merge "Add summary placeholder to data saver preference." into oc-dev

am: a3c4339299

Change-Id: Ia9ab661f1e870764c8e13c945389d734cbee14d4
This commit is contained in:
Doris Ling
2017-05-08 21:04:28 +00:00
committed by android-build-merger
2 changed files with 4 additions and 0 deletions

View File

@@ -2126,6 +2126,9 @@
<string name="sound_settings">Sound</string> <string name="sound_settings">Sound</string>
<!-- DO NOT TRANSLATE Summary placeholder --> <!-- DO NOT TRANSLATE Summary placeholder -->
<string name="summary_placeholder" translatable="false">&#160;</string> <string name="summary_placeholder" translatable="false">&#160;</string>
<!-- DO NOT TRANSLATE Summary placeholder reserving 2 lines -->
<string name="summary_two_lines_placeholder" translatable="false">&#160;\n&#160;</string>
<!-- DO NOT TRANSLATE Empty summary for dynamic preferences --> <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
<string name="summary_empty" translatable="false"></string> <string name="summary_empty" translatable="false"></string>
<!-- Sound settings screen, volume title --> <!-- Sound settings screen, volume title -->

View File

@@ -20,6 +20,7 @@
<Preference <Preference
android:key="unrestricted_access" android:key="unrestricted_access"
android:title="@string/unrestricted_data_saver" android:title="@string/unrestricted_data_saver"
android:summary="@string/summary_two_lines_placeholder"
android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" /> android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
</PreferenceScreen> </PreferenceScreen>