Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37c2d32f authored by Edgar Wang's avatar Edgar Wang Committed by android-build-merger
Browse files

Merge "Add Wifi-calling summary for search result" into qt-dev 

am: 0bb15905

Change-Id: I2b965a83ba504b8e331b99721a605cda696e85ec
parents 6c43c5a9 0bb15905

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

























res/xml/mobile_network_settings.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -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"

































res/xml/mobile_network_settings_v2.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -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"