Merge "Add Wifi-calling summary for search result" into qt-dev am: 0bb1590594

am: 37c2d32f22

Change-Id: I7fadcbe83b4deda09448d5e40b1b26edf368c9cf
This commit is contained in:
Edgar Wang
2019-04-25 04:56:16 -07:00
committed by android-build-merger
3 changed files with 5 additions and 0 deletions

View File

@@ -11092,4 +11092,7 @@
<!-- Warn the user that the phone have emergency call limitation. [CHAR LIMIT=NONE] -->
<string name="wfc_disclaimer_emergency_limitation_desc_text">Emergency calls over Wi\u2011Fi Calling are not supported by your carrier.\nThe device switches automatically to a cellular network to place an emergency call.\nEmergency calls are only possible in areas with cellular coverage.</string>
<!-- Summary for Wi-Fi calling to explain this feature [CHAR LIMIT=NONE] -->
<string name="wifi_calling_summary">Use Wi\u2011Fi for calls to improve quality</string>
</resources>

View File

@@ -83,6 +83,7 @@
<PreferenceScreen
android:key="wifi_calling_key"
android:title="@string/wifi_calling_settings_title"
android:summary="@string/wifi_calling_summary"
settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController" >
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"

View File

@@ -123,6 +123,7 @@
<PreferenceScreen
android:key="wifi_calling_key"
android:title="@string/wifi_calling_settings_title"
android:summary="@string/wifi_calling_summary"
settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"