[Provider Model] Add Internet preference to replace Wi-Fi preference
- Change title from "Wi-Fi" to "Internet" - Remove Wi-Fi switch - Screenshot: https://screenshot.googleplex.com/9tmXYQXKSsuGwEY https://screenshot.googleplex.com/5uMCeruXsX3gP9j Bug: 172295984 Test: manual test atest -c InternetPreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=NetworkDashboardFragmentTest Change-Id: Ie4a3c9aff45fbe7b28594afc9c603e6df57300bf
This commit is contained in:
@@ -12435,6 +12435,8 @@
|
|||||||
<string name="network_and_internet_preferences_title">Preferences</string>
|
<string name="network_and_internet_preferences_title">Preferences</string>
|
||||||
<!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->
|
<!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->
|
||||||
<string name="network_and_internet_preferences_summary">Connect to public networks</string>
|
<string name="network_and_internet_preferences_summary">Connect to public networks</string>
|
||||||
|
<!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] -->
|
||||||
|
<string name="keywords_internet">network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte</string>
|
||||||
|
|
||||||
<!-- Summary for preference when Bedtime mode is on [CHAR LIMIT=NONE] -->
|
<!-- Summary for preference when Bedtime mode is on [CHAR LIMIT=NONE] -->
|
||||||
<string name="aware_summary_when_bedtime_on">Unavailable because bedtime mode is on</string>
|
<string name="aware_summary_when_bedtime_on">Unavailable because bedtime mode is on</string>
|
||||||
|
@@ -21,18 +21,16 @@
|
|||||||
android:title="@string/network_dashboard_title"
|
android:title="@string/network_dashboard_title"
|
||||||
settings:initialExpandedChildrenCount="5">
|
settings:initialExpandedChildrenCount="5">
|
||||||
|
|
||||||
<com.android.settings.widget.PrimarySwitchPreference
|
<com.android.settingslib.RestrictedPreference
|
||||||
android:fragment="com.android.settings.wifi.WifiSettings"
|
android:fragment="com.android.settings.network.NetworkProviderSettings"
|
||||||
android:key="main_toggle_wifi"
|
android:key="internet_settings"
|
||||||
android:title="@string/provider_internet_settings"
|
android:title="@string/provider_internet_settings"
|
||||||
android:summary="@string/summary_placeholder"
|
android:summary="@string/summary_placeholder"
|
||||||
android:icon="@drawable/ic_settings_wireless"
|
android:icon="@drawable/ic_settings_wireless"
|
||||||
android:order="-30"
|
android:order="-30"
|
||||||
settings:allowDividerAbove="true">
|
settings:allowDividerAbove="true"
|
||||||
<intent
|
settings:keywords="@string/keywords_internet"
|
||||||
android:action="android.settings.WIFI_SETTINGS"
|
settings:useAdminDisabledSummary="true" />
|
||||||
android:targetClass="Settings$WifiSettingsActivity" />
|
|
||||||
</com.android.settings.widget.PrimarySwitchPreference>
|
|
||||||
|
|
||||||
<com.android.settingslib.RestrictedPreference
|
<com.android.settingslib.RestrictedPreference
|
||||||
android:key="calls_and_sms"
|
android:key="calls_and_sms"
|
||||||
|
@@ -17,7 +17,7 @@
|
|||||||
<PreferenceScreen
|
<PreferenceScreen
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||||
android:title="@string/network_dashboard_title"
|
android:title="@string/provider_internet_settings"
|
||||||
settings:keywords="@string/keywords_wifi">
|
settings:keywords="@string/keywords_wifi">
|
||||||
|
|
||||||
<com.android.settings.wifi.LinkablePreference
|
<com.android.settings.wifi.LinkablePreference
|
||||||
|
@@ -0,0 +1,82 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.network;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
|
import com.android.settings.widget.SummaryUpdater;
|
||||||
|
import com.android.settings.wifi.WifiSummaryUpdater;
|
||||||
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
|
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||||
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnPause;
|
||||||
|
import com.android.settingslib.core.lifecycle.events.OnResume;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PreferenceController to update the internet state.
|
||||||
|
*/
|
||||||
|
public class InternetPreferenceController extends AbstractPreferenceController implements
|
||||||
|
PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
|
||||||
|
LifecycleObserver, OnResume, OnPause {
|
||||||
|
|
||||||
|
public static final String KEY_INTERNET_SETTINGS = "internet_settings";
|
||||||
|
|
||||||
|
private Preference mPreference;
|
||||||
|
private final WifiSummaryUpdater mSummaryHelper;
|
||||||
|
|
||||||
|
public InternetPreferenceController(Context context) {
|
||||||
|
super(context);
|
||||||
|
mSummaryHelper = new WifiSummaryUpdater(mContext, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
mPreference = screen.findPreference(KEY_INTERNET_SETTINGS);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAvailable() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return KEY_INTERNET_SETTINGS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
mSummaryHelper.register(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
mSummaryHelper.register(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSummaryChanged(String summary) {
|
||||||
|
if (mPreference != null) {
|
||||||
|
mPreference.setSummary(summary);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -104,7 +104,13 @@ public class NetworkDashboardFragment extends DashboardFragment implements
|
|||||||
final MobilePlanPreferenceController mobilePlanPreferenceController =
|
final MobilePlanPreferenceController mobilePlanPreferenceController =
|
||||||
new MobilePlanPreferenceController(context, mobilePlanHost);
|
new MobilePlanPreferenceController(context, mobilePlanHost);
|
||||||
final WifiPrimarySwitchPreferenceController wifiPreferenceController =
|
final WifiPrimarySwitchPreferenceController wifiPreferenceController =
|
||||||
new WifiPrimarySwitchPreferenceController(context, metricsFeatureProvider);
|
isProviderModelEnabled(context)
|
||||||
|
? null
|
||||||
|
: new WifiPrimarySwitchPreferenceController(
|
||||||
|
context,
|
||||||
|
metricsFeatureProvider);
|
||||||
|
final InternetPreferenceController internetPreferenceController =
|
||||||
|
isProviderModelEnabled(context) ? new InternetPreferenceController(context) : null;
|
||||||
|
|
||||||
final VpnPreferenceController vpnPreferenceController =
|
final VpnPreferenceController vpnPreferenceController =
|
||||||
new VpnPreferenceController(context);
|
new VpnPreferenceController(context);
|
||||||
@@ -113,7 +119,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements
|
|||||||
|
|
||||||
if (lifecycle != null) {
|
if (lifecycle != null) {
|
||||||
lifecycle.addObserver(mobilePlanPreferenceController);
|
lifecycle.addObserver(mobilePlanPreferenceController);
|
||||||
lifecycle.addObserver(wifiPreferenceController);
|
if (wifiPreferenceController != null) {
|
||||||
|
lifecycle.addObserver(wifiPreferenceController);
|
||||||
|
}
|
||||||
|
if (internetPreferenceController != null) {
|
||||||
|
lifecycle.addObserver(internetPreferenceController);
|
||||||
|
}
|
||||||
lifecycle.addObserver(vpnPreferenceController);
|
lifecycle.addObserver(vpnPreferenceController);
|
||||||
lifecycle.addObserver(privateDnsPreferenceController);
|
lifecycle.addObserver(privateDnsPreferenceController);
|
||||||
}
|
}
|
||||||
@@ -125,7 +136,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements
|
|||||||
controllers.add(vpnPreferenceController);
|
controllers.add(vpnPreferenceController);
|
||||||
controllers.add(new ProxyPreferenceController(context));
|
controllers.add(new ProxyPreferenceController(context));
|
||||||
controllers.add(mobilePlanPreferenceController);
|
controllers.add(mobilePlanPreferenceController);
|
||||||
controllers.add(wifiPreferenceController);
|
if (wifiPreferenceController != null) {
|
||||||
|
controllers.add(wifiPreferenceController);
|
||||||
|
}
|
||||||
|
if (internetPreferenceController != null) {
|
||||||
|
controllers.add(internetPreferenceController);
|
||||||
|
}
|
||||||
controllers.add(privateDnsPreferenceController);
|
controllers.add(privateDnsPreferenceController);
|
||||||
return controllers;
|
return controllers;
|
||||||
}
|
}
|
||||||
|
@@ -35,6 +35,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
|
|||||||
/**
|
/**
|
||||||
* PreferenceController to update the wifi state.
|
* PreferenceController to update the wifi state.
|
||||||
*/
|
*/
|
||||||
|
// TODO(b/167474581): Should clean up this controller when Provider Model finished.
|
||||||
public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceController
|
public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceController
|
||||||
implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
|
implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
|
||||||
LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
|
LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
|
||||||
|
@@ -0,0 +1,122 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.network;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.mockito.Mockito.times;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.content.BroadcastReceiver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.IntentFilter;
|
||||||
|
import android.net.ConnectivityManager;
|
||||||
|
import android.net.NetworkRequest;
|
||||||
|
import android.net.NetworkScoreManager;
|
||||||
|
import android.net.wifi.WifiManager;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Looper;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceManager;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
|
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class InternetPreferenceControllerTest {
|
||||||
|
|
||||||
|
private static final String TEST_SUMMARY = "test summary";
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private InternetPreferenceController mController;
|
||||||
|
private PreferenceScreen mScreen;
|
||||||
|
private Preference mPreference;
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private ConnectivityManager mConnectivityManager;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||||
|
when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
|
||||||
|
when(mContext.getSystemService(NetworkScoreManager.class))
|
||||||
|
.thenReturn(mock(NetworkScoreManager.class));
|
||||||
|
final WifiManager wifiManager = mock(WifiManager.class);
|
||||||
|
when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
|
||||||
|
when(wifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
|
||||||
|
|
||||||
|
mController = new InternetPreferenceController(mContext);
|
||||||
|
if (Looper.myLooper() == null) {
|
||||||
|
Looper.prepare();
|
||||||
|
}
|
||||||
|
final PreferenceManager preferenceManager = new PreferenceManager(mContext);
|
||||||
|
mScreen = preferenceManager.createPreferenceScreen(mContext);
|
||||||
|
mPreference = new Preference(mContext);
|
||||||
|
mPreference.setKey(InternetPreferenceController.KEY_INTERNET_SETTINGS);
|
||||||
|
mScreen.addPreference(mPreference);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isAvailable_shouldBeTrue() {
|
||||||
|
assertThat(mController.isAvailable()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onResume_shouldRegisterCallback() {
|
||||||
|
mController.onResume();
|
||||||
|
|
||||||
|
verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
|
||||||
|
verify(mConnectivityManager).registerNetworkCallback(
|
||||||
|
any(NetworkRequest.class),
|
||||||
|
any(ConnectivityManager.NetworkCallback.class),
|
||||||
|
any(Handler.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPause_shouldUnregisterCallback() {
|
||||||
|
mController.onResume();
|
||||||
|
mController.onPause();
|
||||||
|
|
||||||
|
verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
|
||||||
|
verify(mConnectivityManager, times(2)).unregisterNetworkCallback(
|
||||||
|
any(ConnectivityManager.NetworkCallback.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onSummaryChanged_shouldUpdatePreferenceSummary() {
|
||||||
|
mController.displayPreference(mScreen);
|
||||||
|
|
||||||
|
mController.onSummaryChanged(TEST_SUMMARY);
|
||||||
|
|
||||||
|
assertThat(mPreference.getSummary()).isEqualTo(TEST_SUMMARY);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user