[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:
@@ -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 =
|
||||
new MobilePlanPreferenceController(context, mobilePlanHost);
|
||||
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 =
|
||||
new VpnPreferenceController(context);
|
||||
@@ -113,7 +119,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements
|
||||
|
||||
if (lifecycle != null) {
|
||||
lifecycle.addObserver(mobilePlanPreferenceController);
|
||||
lifecycle.addObserver(wifiPreferenceController);
|
||||
if (wifiPreferenceController != null) {
|
||||
lifecycle.addObserver(wifiPreferenceController);
|
||||
}
|
||||
if (internetPreferenceController != null) {
|
||||
lifecycle.addObserver(internetPreferenceController);
|
||||
}
|
||||
lifecycle.addObserver(vpnPreferenceController);
|
||||
lifecycle.addObserver(privateDnsPreferenceController);
|
||||
}
|
||||
@@ -125,7 +136,12 @@ public class NetworkDashboardFragment extends DashboardFragment implements
|
||||
controllers.add(vpnPreferenceController);
|
||||
controllers.add(new ProxyPreferenceController(context));
|
||||
controllers.add(mobilePlanPreferenceController);
|
||||
controllers.add(wifiPreferenceController);
|
||||
if (wifiPreferenceController != null) {
|
||||
controllers.add(wifiPreferenceController);
|
||||
}
|
||||
if (internetPreferenceController != null) {
|
||||
controllers.add(internetPreferenceController);
|
||||
}
|
||||
controllers.add(privateDnsPreferenceController);
|
||||
return controllers;
|
||||
}
|
||||
|
Reference in New Issue
Block a user