diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2015-03-23 14:43:24 -0700 |
|---|---|---|
| committer | Pavel Zhamaitsiak <pavelz@google.com> | 2015-03-23 14:43:24 -0700 |
| commit | ee5f27dbeeef90381de905d05b3b67bc1837df20 (patch) | |
| tree | 53ab28c8b4c663cf910b7489c9c521bfbe4028fd /res/xml/wireless_settings.xml | |
| parent | 71a692225efed6ac3b318441bc31e637204561f6 (diff) | |
| download | packages_apps_Settings-ee5f27dbeeef90381de905d05b3b67bc1837df20.zip packages_apps_Settings-ee5f27dbeeef90381de905d05b3b67bc1837df20.tar.gz packages_apps_Settings-ee5f27dbeeef90381de905d05b3b67bc1837df20.tar.bz2 | |
Update Wi-Fi Calling settings
- Update strings
- Move WFC mode summary strings to framework/base
- Update screens to reflect latest UX requirements
Change-Id: Ibcb1a0b6eec2342dfbaa30f90fe728976ad80a0d
Diffstat (limited to 'res/xml/wireless_settings.xml')
| -rw-r--r-- | res/xml/wireless_settings.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index 7a4ed9a..b615c9e 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -38,6 +38,12 @@ android:persistent="false" /> <PreferenceScreen + android:key="wifi_calling_settings" + android:title="@string/wifi_calling_settings_title" + settings:keywords="@string/keywords_wifi_calling" + android:fragment="com.android.settings.WifiCallingSettings" /> + + <PreferenceScreen android:fragment="com.android.settings.nfc.AndroidBeam" android:key="android_beam_settings" android:title="@string/android_beam_settings_title" /> @@ -63,12 +69,6 @@ android:targetClass="com.android.phone.MobileNetworkSettings" /> </PreferenceScreen> - <PreferenceScreen - android:key="wifi_calling_settings" - android:title="@string/wifi_calling_settings_title" - settings:keywords="@string/keywords_wifi_calling" - android:fragment="com.android.settings.WifiCallingSettings" /> - <Preference android:key="manage_mobile_plan" android:title="@string/manage_mobile_plan_title" |