diff options
| author | PauloftheWest <paulofthewest@google.com> | 2014-08-24 11:59:35 -0700 |
|---|---|---|
| committer | PauloftheWest <paulofthewest@google.com> | 2014-08-25 08:45:05 -0700 |
| commit | 656c88cb7142595ae96e17b5ecef4fb5f511779f (patch) | |
| tree | fcbf77b53df2e9e88f06b25abd1568c3b7c6de74 /src/com/android/settings/TetherSettings.java | |
| parent | 8fe710682ad3f5a5ac0ed1393f3d934bea122bc5 (diff) | |
| download | packages_apps_Settings-656c88cb7142595ae96e17b5ecef4fb5f511779f.zip packages_apps_Settings-656c88cb7142595ae96e17b5ecef4fb5f511779f.tar.gz packages_apps_Settings-656c88cb7142595ae96e17b5ecef4fb5f511779f.tar.bz2 | |
Updated Tethering and portable hotspot to use switches.
Bug: 17020102
Change-Id: I5da1745d4ea9545f8960c015ca6858fb0a34de0d
Diffstat (limited to 'src/com/android/settings/TetherSettings.java')
| -rw-r--r-- | src/com/android/settings/TetherSettings.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index d960ce6..8069d52 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -40,9 +40,9 @@ import android.os.Environment; import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; -import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.PreferenceScreen; +import android.preference.SwitchPreference; import android.text.TextUtils; import android.view.ViewGroup; import android.view.ViewParent; @@ -68,12 +68,12 @@ public class TetherSettings extends SettingsPreferenceFragment private static final int DIALOG_AP_SETTINGS = 1; private WebView mView; - private CheckBoxPreference mUsbTether; + private SwitchPreference mUsbTether; private WifiApEnabler mWifiApEnabler; - private CheckBoxPreference mEnableWifiAp; + private SwitchPreference mEnableWifiAp; - private CheckBoxPreference mBluetoothTether; + private SwitchPreference mBluetoothTether; private BroadcastReceiver mTetherChangeReceiver; @@ -135,10 +135,10 @@ public class TetherSettings extends SettingsPreferenceFragment } mEnableWifiAp = - (CheckBoxPreference) findPreference(ENABLE_WIFI_AP); + (SwitchPreference) findPreference(ENABLE_WIFI_AP); Preference wifiApSettings = findPreference(WIFI_AP_SSID_AND_SECURITY); - mUsbTether = (CheckBoxPreference) findPreference(USB_TETHER_SETTINGS); - mBluetoothTether = (CheckBoxPreference) findPreference(ENABLE_BLUETOOTH_TETHERING); + mUsbTether = (SwitchPreference) findPreference(USB_TETHER_SETTINGS); + mBluetoothTether = (SwitchPreference) findPreference(ENABLE_BLUETOOTH_TETHERING); ConnectivityManager cm = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE); @@ -484,7 +484,7 @@ public class TetherSettings extends SettingsPreferenceFragment if (resultCode == Activity.RESULT_OK) { startTethering(); } else { - //BT and USB need checkbox turned off on failure + //BT and USB need switch turned off on failure //Wifi tethering is never turned on until afterwards switch (mTetherChoice) { case BLUETOOTH_TETHERING: |