[Wi-Fi] Add STA+AP information in Hotspot & tethering footer
Use WifiManager#isStaApConcurrencySupported() to check if a device supports STA+AP and shows the footer information. Bug: 121328949 Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest Change-Id: I3446abb5cc9cdf76da8d17f5de31bd65715c165c
This commit is contained in:
@@ -56,6 +56,7 @@ import com.android.settings.widget.SwitchBarController;
|
||||
import com.android.settings.wifi.tether.WifiTetherApBandPreferenceController;
|
||||
import com.android.settings.wifi.tether.WifiTetherAutoOffPreferenceController;
|
||||
import com.android.settings.wifi.tether.WifiTetherBasePreferenceController;
|
||||
import com.android.settings.wifi.tether.WifiTetherFooterPreferenceController;
|
||||
import com.android.settings.wifi.tether.WifiTetherPasswordPreferenceController;
|
||||
import com.android.settings.wifi.tether.WifiTetherSSIDPreferenceController;
|
||||
import com.android.settings.wifi.tether.WifiTetherSecurityPreferenceController;
|
||||
@@ -71,7 +72,7 @@ import java.util.concurrent.atomic.AtomicReference;
|
||||
* Displays preferences for all Tethering options.
|
||||
*/
|
||||
@SearchIndexable
|
||||
public final class AllInOneTetherSettings extends RestrictedDashboardFragment
|
||||
public class AllInOneTetherSettings extends RestrictedDashboardFragment
|
||||
implements DataSaverBackend.Listener,
|
||||
WifiTetherBasePreferenceController.OnTetherConfigUpdateListener,
|
||||
SharedPreferences.OnSharedPreferenceChangeListener {
|
||||
@@ -304,6 +305,8 @@ public final class AllInOneTetherSettings extends RestrictedDashboardFragment
|
||||
new WifiTetherSecurityPreferenceController(context, listener));
|
||||
controllers.add(
|
||||
new WifiTetherAutoOffPreferenceController(context, KEY_WIFI_TETHER_AUTO_OFF));
|
||||
controllers.add(
|
||||
new WifiTetherFooterPreferenceController(context));
|
||||
|
||||
return controllers;
|
||||
}
|
||||
|
@@ -31,6 +31,7 @@ import android.content.IntentFilter;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.hardware.usb.UsbManager;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.os.Bundle;
|
||||
import android.os.Environment;
|
||||
import android.os.Handler;
|
||||
@@ -71,6 +72,8 @@ public class TetherSettings extends RestrictedSettingsFragment
|
||||
@VisibleForTesting
|
||||
static final String KEY_ENABLE_BLUETOOTH_TETHERING = "enable_bluetooth_tethering";
|
||||
private static final String KEY_DATA_SAVER_FOOTER = "disabled_on_data_saver";
|
||||
@VisibleForTesting
|
||||
static final String KEY_TETHER_PREFS_FOOTER = "tether_prefs_footer";
|
||||
|
||||
private static final String TAG = "TetheringSettings";
|
||||
|
||||
@@ -141,6 +144,7 @@ public class TetherSettings extends RestrictedSettingsFragment
|
||||
|
||||
mUsbTether = (SwitchPreference) findPreference(KEY_USB_TETHER_SETTINGS);
|
||||
mBluetoothTether = (SwitchPreference) findPreference(KEY_ENABLE_BLUETOOTH_TETHERING);
|
||||
setFooterPreferenceTitle();
|
||||
|
||||
mDataSaverBackend.addListener(this);
|
||||
|
||||
@@ -201,6 +205,18 @@ public class TetherSettings extends RestrictedSettingsFragment
|
||||
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void setFooterPreferenceTitle() {
|
||||
final Preference footerPreference = findPreference(KEY_TETHER_PREFS_FOOTER);
|
||||
final WifiManager wifiManager =
|
||||
(WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
|
||||
if (wifiManager.isStaApConcurrencySupported()) {
|
||||
footerPreference.setTitle(R.string.tethering_footer_info_sta_ap_concurrency);
|
||||
} else {
|
||||
footerPreference.setTitle(R.string.tethering_footer_info);
|
||||
}
|
||||
}
|
||||
|
||||
private class TetherChangeReceiver extends BroadcastReceiver {
|
||||
@Override
|
||||
public void onReceive(Context content, Intent intent) {
|
||||
|
@@ -34,6 +34,7 @@ import com.android.settingslib.wifi.AccessPointPreference;
|
||||
import com.android.settingslib.wifi.WifiTracker;
|
||||
import com.android.settingslib.wifi.WifiTrackerFactory;
|
||||
|
||||
// TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
|
||||
/**
|
||||
* This places a preference into a PreferenceGroup owned by some parent
|
||||
* controller class when there is a wifi connection present.
|
||||
|
@@ -32,6 +32,7 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
|
||||
import com.android.settingslib.core.lifecycle.events.OnStart;
|
||||
import com.android.settingslib.core.lifecycle.events.OnStop;
|
||||
|
||||
// TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
|
||||
public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController
|
||||
implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
|
||||
LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
|
||||
|
@@ -101,6 +101,7 @@ import java.time.format.FormatStyle;
|
||||
import java.util.StringJoiner;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
// TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
|
||||
/**
|
||||
* Controller for logic pertaining to displaying Wifi information for the
|
||||
* {@link WifiNetworkDetailsFragment}.
|
||||
|
@@ -26,6 +26,7 @@ import androidx.preference.PreferenceScreen;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
// TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
|
||||
public abstract class WifiTetherBasePreferenceController extends AbstractPreferenceController
|
||||
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
|
||||
|
||||
|
@@ -0,0 +1,54 @@
|
||||
/*
|
||||
* 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.wifi.tether;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
/**
|
||||
* Shows hotspot footer information.
|
||||
*/
|
||||
public class WifiTetherFooterPreferenceController extends WifiTetherBasePreferenceController {
|
||||
|
||||
private static final String PREF_KEY = "tether_prefs_footer_2";
|
||||
|
||||
public WifiTetherFooterPreferenceController(Context context) {
|
||||
super(context, null /* listener */);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return PREF_KEY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateDisplay() {
|
||||
if (mWifiManager.isStaApConcurrencySupported()) {
|
||||
mPreference.setTitle(R.string.tethering_footer_info_sta_ap_concurrency);
|
||||
} else {
|
||||
mPreference.setTitle(R.string.tethering_footer_info);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
return true;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user