PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wi-Fi calling settings cleanup

Browse Source 
automerge: 7109932

* commit '71099329cc0443ce4517480c86f81ed6b4e33ff2':
  Wi-Fi calling settings cleanup
This commit is contained in:
Pavel Zhamaitsiak
2015-03-03 23:41:33 +00:00
committed by android-build-merger
parent 171d147905 71099329cc
commit 9a4b136ffb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

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

1
res/xml/wireless_settings.xml
View File

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

3
src/com/android/settings/WifiCallingSettings.java
View File

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