Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev

am: bcb2565e05

Change-Id: I8a89b5a7676a9fb9961e4275c417a425baa5938e
This commit is contained in:
Matthew Fritze
2017-05-17 04:46:15 +00:00
committed by android-build-merger
5 changed files with 4 additions and 83 deletions

View File

@@ -22,6 +22,6 @@
<DropDownPreference
android:key="turn_on_automatically"
android:title="@string/battery_saver_turn_on_automatically_title"
android:summary="@string/summary_placeholder" />
android:summary="%s" />
</PreferenceScreen>

View File

@@ -124,7 +124,7 @@
<DropDownPreference
android:key="dock_audio_media"
android:title="@string/dock_audio_media_title"
android:summary="@string/summary_placeholder" />
android:summary="%s" />
<!-- Boot sounds -->
<SwitchPreference
@@ -135,7 +135,7 @@
<DropDownPreference
android:key="emergency_tone"
android:title="@string/emergency_tone_title"
android:summary="@string/summary_placeholder" />
android:summary="%s" />
<com.android.settingslib.RestrictedPreference
android:key="cell_broadcast_settings"