diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2015-03-03 23:41:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-03-03 23:41:33 +0000 |
| commit | 9a4b136ffb6012d8bd9926c7106b258d940e6abf (patch) | |
| tree | e8c0de80a71ceb4ab2a12c233c739b15597bb1ce | |
| parent | 171d147905776a8442b43de83d3e8d5c34b8c644 (diff) | |
| parent | 71099329cc0443ce4517480c86f81ed6b4e33ff2 (diff) | |
| download | packages_apps_Settings-9a4b136ffb6012d8bd9926c7106b258d940e6abf.zip packages_apps_Settings-9a4b136ffb6012d8bd9926c7106b258d940e6abf.tar.gz packages_apps_Settings-9a4b136ffb6012d8bd9926c7106b258d940e6abf.tar.bz2 | |
Wi-Fi calling settings cleanup
automerge: 7109932
* commit '71099329cc0443ce4517480c86f81ed6b4e33ff2':
Wi-Fi calling settings cleanup
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | res/xml/wireless_settings.xml | 1 | ||||
| -rw-r--r-- | src/com/android/settings/WifiCallingSettings.java | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 190cb80..8e29e5d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1884,7 +1884,7 @@ Label on Wifi Configuration screen--> <string name="config_list_label" translatable="false">Configured networks</string> - <!-- Wireless networks, item title to go into the WFC settings --> + <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] --> <string name="wifi_calling_settings_title">Wi-Fi calling</string> <!-- WFC mode [CHAR LIMIT=30] --> <string name="wifi_calling_mode_title">Wi-Fi calling mode</string> @@ -5637,6 +5637,7 @@ <string name="keywords_wifi">wifi wi-fi network connection</string> <string name="keywords_more_default_sms_app">text message texting messages messaging</string> <string name="keywords_more_mobile_networks">cellular cell carrier wireless data 4g 3g 2g lte</string> + <string name="keywords_wifi_calling">wifi wi-fi call calling roaming handoff</string> <string name="keywords_home">launcher</string> <string name="keywords_display">screen touchscreen</string> <string name="keywords_display_brightness_level">dim screen touchscreen battery</string> diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml index fc3ca16..7a4ed9a 100644 --- a/res/xml/wireless_settings.xml +++ b/res/xml/wireless_settings.xml @@ -66,6 +66,7 @@ <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 diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java index 6b64fdf..2e8fb74 100644 --- a/src/com/android/settings/WifiCallingSettings.java +++ b/src/com/android/settings/WifiCallingSettings.java @@ -28,7 +28,6 @@ import android.widget.Switch; import com.android.ims.ImsConfig; import com.android.ims.ImsManager; -import com.android.settings.search.Indexable; import com.android.settings.widget.SwitchBar; /** @@ -38,7 +37,7 @@ import com.android.settings.widget.SwitchBar; */ public class WifiCallingSettings extends SettingsPreferenceFragment implements SwitchBar.OnSwitchChangeListener, - Preference.OnPreferenceChangeListener, Indexable { + Preference.OnPreferenceChangeListener { private static final String TAG = "WifiCallingSettings"; |