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

Misc tweak on wifi hotspot setting page

Browse Source 
- Make hotspot password show in plain text
- Make main control into a master switch style

Change-Id: I8fdb293a617787f256fb663708cfc0e454f548d2
Fixes: 63865785
Test: robotests
This commit is contained in:
Fan Zhang
2017-08-03 13:04:28 -07:00
parent 56538f1775
commit 7686ef863c
8 changed files with 106 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/tether_prefs.xml
View File

@@ -17,10 +17,10 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto">
<Preference
<com.android.settings.widget.MasterSwitchPreference
android:key="wifi_tether"
android:title="@string/wifi_hotspot_checkbox_text"
android:summary="@string/summary_placeholder"
android:summary="@string/summary_two_lines_placeholder"
android:fragment="com.android.settings.wifi.tether.WifiTetherSettings" />
<SwitchPreference

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() {

14
tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
View File

@@ -16,6 +16,12 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.wifi.WifiConfiguration;
@@ -35,12 +41,6 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -85,7 +85,7 @@ public class WifiTetherPasswordPreferenceControllerTest {
mController.displayPreference(mScreen);
assertThat(mPreference.getText()).isEqualTo(mConfig.preSharedKey);
assertThat(mPreference.isPassword()).isTrue();
assertThat(mPreference.getSummary()).isEqualTo(mConfig.preSharedKey);
}
@Test

66
tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
View File

@@ -16,6 +16,14 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.Context;
@@ -25,14 +33,16 @@ 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 com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,18 +57,11 @@ import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
shadows = {
WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class
WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
WifiTetherPreferenceControllerTest.ShadowWifiTetherSwitchBarController.class,
})
public class WifiTetherPreferenceControllerTest {
@@ -73,13 +76,13 @@ public class WifiTetherPreferenceControllerTest {
private WifiTetherPreferenceController mController;
private Lifecycle mLifecycle;
private Preference mPreference;
private MasterSwitchPreference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mLifecycle = new Lifecycle();
mPreference = new Preference(RuntimeEnvironment.application);
mPreference = new MasterSwitchPreference(RuntimeEnvironment.application);
when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
.thenReturn(mConnectivityManager);
when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
@@ -89,6 +92,11 @@ public class WifiTetherPreferenceControllerTest {
mController = new WifiTetherPreferenceController(mContext, mLifecycle);
}
@After
public void tearDown() {
ShadowWifiTetherSwitchBarController.reset();
}
@Test
public void isAvailable_noTetherRegex_shouldReturnFalse() {
when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{});
@@ -103,16 +111,17 @@ public class WifiTetherPreferenceControllerTest {
}
@Test
public void resumeAndPause_shouldRegisterUnregisterReceiver() {
public void startAndStop_shouldRegisterUnregisterReceiver() {
final BroadcastReceiver receiver = ReflectionHelpers.getField(mController, "mReceiver");
mController.displayPreference(mScreen);
mLifecycle.onResume();
mLifecycle.onPause();
mLifecycle.onStart();
mLifecycle.onStop();
assertThat(ShadowWifiTetherSwitchBarController.onStartCalled).isTrue();
assertThat(ShadowWifiTetherSwitchBarController.onStopCalled).isTrue();
verify(mContext).registerReceiver(eq(receiver), any(IntentFilter.class));
verify(mContext).unregisterReceiver(receiver);
}
@Test
@@ -183,4 +192,29 @@ public class WifiTetherPreferenceControllerTest {
return true;
}
}
@Implements(WifiTetherSwitchBarController.class)
public static final class ShadowWifiTetherSwitchBarController {
public static boolean onStartCalled;
public static boolean onStopCalled;
public void __constructor__(Context context, SwitchWidgetController switchWidget) {
}
public static void reset() {
onStartCalled = false;
onStopCalled = false;
}
@Implementation
public void onStart() {
onStartCalled = true;
}
@Implementation
public void onStop() {
onStopCalled = true;
}
}
}