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

Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-04 22:36:57 +00:00
committed by Android (Google) Code Review
parent 0bfe384b93 7686ef863c
commit 4c84a61581
8 changed files with 106 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/tether/NoOpOnStartTetheringCallback.java
View File

@@ -18,6 +18,10 @@ package com.android.settings.wifi.tether;
import android.net.ConnectivityManager;
class NoOpOnStartTetheringCallback extends ConnectivityManager.OnStartTetheringCallback {
class NoOpOnStartTetheringCallback {
public static ConnectivityManager.OnStartTetheringCallback newInstance() {
return new ConnectivityManager.OnStartTetheringCallback() {
};
}
}

11
src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi.tether;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
import android.support.v7.preference.EditTextPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -48,15 +49,14 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
((ValidatedEditTextPreference) mPreference).setText(mPassword);
((ValidatedEditTextPreference) mPreference).setIsPassword(true);
((ValidatedEditTextPreference) mPreference).setValidator(this);
updatePasswordDisplay((EditTextPreference) mPreference);
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
mPassword = (String) newValue;
((ValidatedEditTextPreference) mPreference).setText(mPassword);
updatePasswordDisplay((EditTextPreference) mPreference);
mListener.onTetherConfigUpdated();
return true;
}
@@ -69,4 +69,9 @@ public class WifiTetherPasswordPreferenceController extends WifiTetherBasePrefer
public boolean isTextValid(String value) {
return WifiUtils.isPasswordValid(value);
}
private void updatePasswordDisplay(EditTextPreference preference) {
preference.setText(mPassword);
preference.setSummary(mPassword);
}
}

29
src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
View File

@@ -24,23 +24,24 @@ import android.net.ConnectivityManager;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.text.BidiFormatter;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.MasterSwitchController;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import java.util.List;
public class WifiTetherPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
public static final IntentFilter WIFI_TETHER_INTENT_FILTER;
private static final String WIFI_TETHER_SETTINGS = "wifi_tether";
@@ -48,7 +49,9 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
private final ConnectivityManager mConnectivityManager;
private final String[] mWifiRegexs;
private final WifiManager mWifiManager;
private Preference mPreference;
private final Lifecycle mLifecycle;
private WifiTetherSwitchBarController mSwitchController;
private MasterSwitchPreference mPreference;
static {
WIFI_TETHER_INTENT_FILTER = new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
@@ -61,9 +64,8 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
mConnectivityManager =
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mWifiRegexs = mConnectivityManager.getTetherableWifiRegexs();
mLifecycle = lifecycle;
if (lifecycle != null) {
lifecycle.addObserver(this);
}
@@ -80,7 +82,14 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(WIFI_TETHER_SETTINGS);
mPreference = (MasterSwitchPreference) screen.findPreference(WIFI_TETHER_SETTINGS);
if (mPreference == null) {
// unavailable
return;
}
mSwitchController = new WifiTetherSwitchBarController(
mContext, new MasterSwitchController(mPreference));
mLifecycle.addObserver(mSwitchController);
}
@Override
@@ -89,7 +98,7 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
}
@Override
public void onResume() {
public void onStart() {
if (mPreference != null) {
mContext.registerReceiver(mReceiver, WIFI_TETHER_INTENT_FILTER);
clearSummaryForAirplaneMode();
@@ -97,7 +106,7 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController
}
@Override
public void onPause() {
public void onStop() {
if (mPreference != null) {
mContext.unregisterReceiver(mReceiver);
}

4
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -36,6 +36,7 @@ import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.SwitchBarController;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
@@ -94,7 +95,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
// SettingsActivity as base for all preference fragments.
final SettingsActivity activity = (SettingsActivity) getActivity();
final SwitchBar switchBar = activity.getSwitchBar();
mSwitchBarController = new WifiTetherSwitchBarController(activity, switchBar);
mSwitchBarController = new WifiTetherSwitchBarController(activity,
new SwitchBarController(switchBar));
getLifecycle().addObserver(mSwitchBarController);
switchBar.show();
}

24
src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.wifi.tether;
import static android.net.ConnectivityManager.TETHERING_WIFI;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -24,53 +26,51 @@ import android.net.wifi.WifiManager;
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
import android.widget.Switch;
import com.android.settings.datausage.DataSaverBackend;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import static android.net.ConnectivityManager.TETHERING_WIFI;
public class WifiTetherSwitchBarController implements SwitchBar.OnSwitchChangeListener,
public class WifiTetherSwitchBarController implements SwitchWidgetController.OnSwitchChangeListener,
LifecycleObserver, OnStart, OnStop {
private final Context mContext;
private final SwitchBar mSwitchBar;
private final SwitchWidgetController mSwitchBar;
private final ConnectivityManager mConnectivityManager;
private final DataSaverBackend mDataSaverBackend;
private final NoOpOnStartTetheringCallback mOnStartTetheringCallback;
WifiTetherSwitchBarController(Context context, SwitchBar switchBar) {
WifiTetherSwitchBarController(Context context, SwitchWidgetController switchBar) {
mContext = context;
mSwitchBar = switchBar;
mDataSaverBackend = new DataSaverBackend(context);
mOnStartTetheringCallback = new NoOpOnStartTetheringCallback();
mConnectivityManager =
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.setListener(this);
}
@Override
public void onStart() {
mSwitchBar.startListening();
mContext.registerReceiver(mReceiver,
WifiTetherPreferenceController.WIFI_TETHER_INTENT_FILTER);
}
@Override
public void onStop() {
mSwitchBar.stopListening();
mContext.unregisterReceiver(mReceiver);
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
public boolean onSwitchToggled(boolean isChecked) {
if (isChecked) {
startTether();
} else {
stopTether();
}
return true;
}
void stopTether() {
@@ -81,7 +81,7 @@ public class WifiTetherSwitchBarController implements SwitchBar.OnSwitchChangeLi
void startTether() {
mSwitchBar.setEnabled(false);
mConnectivityManager.startTethering(TETHERING_WIFI, true /* showProvisioningUi */,
mOnStartTetheringCallback, new Handler(Looper.getMainLooper()));
NoOpOnStartTetheringCallback.newInstance(), new Handler(Looper.getMainLooper()));
}
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {