Added "Speed and Compatibility" Settings page
- Show each band option individually in single-band devices - Show "2.4 and 5GHz" combined option in dual-band devices - Disable 5 GHz option if the device is in the restricted country - Disable 6 GHz option if the device is in the restricted country - Hide 6 GHz option if the old device does not support 6 GHz band. Bug: 245258763 Test: manual test atest -c WifiHotspotSpeedSettingsTest atest -c WifiHotspotSpeedViewModelTest \ WifiHotspotRepositoryTest Change-Id: I358d4ff8d62df72fd5080e55f40d588c238d01fb
This commit is contained in:
@@ -0,0 +1,132 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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 static com.android.settings.wifi.repository.WifiHotspotRepository.SPEED_2GHZ;
|
||||
import static com.android.settings.wifi.repository.WifiHotspotRepository.SPEED_2GHZ_5GHZ;
|
||||
import static com.android.settings.wifi.repository.WifiHotspotRepository.SPEED_5GHZ;
|
||||
import static com.android.settings.wifi.repository.WifiHotspotRepository.SPEED_6GHZ;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.os.Bundle;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
import com.android.settingslib.widget.SelectorWithWidgetPreference;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Wi-Fi Hotspot Speed & compatibility Settings
|
||||
*/
|
||||
public class WifiHotspotSpeedSettings extends DashboardFragment implements
|
||||
SelectorWithWidgetPreference.OnClickListener {
|
||||
|
||||
private static final String TAG = "WifiHotspotSpeedSettings";
|
||||
|
||||
protected static final String KEY_SPEED_2GHZ = "wifi_hotspot_speed_2g";
|
||||
protected static final String KEY_SPEED_5GHZ = "wifi_hotspot_speed_5g";
|
||||
protected static final String KEY_SPEED_2GHZ_5GHZ = "wifi_hotspot_speed_2g_5g";
|
||||
protected static final String KEY_SPEED_6GHZ = "wifi_hotspot_speed_6g";
|
||||
protected static Map<String, Integer> sSpeedKeyMap = new HashMap<>();
|
||||
|
||||
static {
|
||||
sSpeedKeyMap.put(KEY_SPEED_2GHZ, SPEED_2GHZ);
|
||||
sSpeedKeyMap.put(KEY_SPEED_5GHZ, SPEED_5GHZ);
|
||||
sSpeedKeyMap.put(KEY_SPEED_2GHZ_5GHZ, SPEED_2GHZ_5GHZ);
|
||||
sSpeedKeyMap.put(KEY_SPEED_6GHZ, SPEED_6GHZ);
|
||||
}
|
||||
|
||||
protected WifiHotspotSpeedViewModel mWifiHotspotSpeedViewModel;
|
||||
protected Map<Integer, SelectorWithWidgetPreference> mSpeedPreferenceMap = new HashMap<>();
|
||||
|
||||
@Override
|
||||
protected int getPreferenceScreenResId() {
|
||||
return R.xml.wifi_hotspot_speed;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getLogTag() {
|
||||
return TAG;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return SettingsEnums.WIFI_TETHER_SETTINGS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle icicle) {
|
||||
super.onCreate(icicle);
|
||||
loadPreferences();
|
||||
mWifiHotspotSpeedViewModel = FeatureFactory.getFactory(getContext())
|
||||
.getWifiFeatureProvider().getWifiHotspotSpeedViewModel(this);
|
||||
onSpeedInfoMapDataChanged(mWifiHotspotSpeedViewModel.getSpeedInfoMapData().getValue());
|
||||
mWifiHotspotSpeedViewModel.getSpeedInfoMapData()
|
||||
.observe(this, this::onSpeedInfoMapDataChanged);
|
||||
}
|
||||
|
||||
protected void loadPreferences() {
|
||||
for (Map.Entry<String, Integer> entry : sSpeedKeyMap.entrySet()) {
|
||||
SelectorWithWidgetPreference preference = findPreference(entry.getKey());
|
||||
if (preference != null) {
|
||||
preference.setOnClickListener(this);
|
||||
mSpeedPreferenceMap.put(entry.getValue(), preference);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void onSpeedInfoMapDataChanged(
|
||||
Map<Integer, WifiHotspotSpeedViewModel.SpeedInfo> speedInfoMap) {
|
||||
log("onSpeedViewDataChanged(), speedInfoMap:" + speedInfoMap);
|
||||
for (Map.Entry<Integer, SelectorWithWidgetPreference> entry :
|
||||
mSpeedPreferenceMap.entrySet()) {
|
||||
WifiHotspotSpeedViewModel.SpeedInfo speedInfo = speedInfoMap.get(entry.getKey());
|
||||
if (speedInfo == null) {
|
||||
continue;
|
||||
}
|
||||
SelectorWithWidgetPreference radioButton = entry.getValue();
|
||||
if (radioButton == null) {
|
||||
continue;
|
||||
}
|
||||
if (radioButton.isChecked() != speedInfo.mIsChecked) {
|
||||
radioButton.setChecked(speedInfo.mIsChecked);
|
||||
}
|
||||
if (radioButton.isEnabled() != speedInfo.mIsEnabled) {
|
||||
radioButton.setEnabled(speedInfo.mIsEnabled);
|
||||
}
|
||||
if (radioButton.isVisible() != speedInfo.mIsVisible) {
|
||||
radioButton.setVisible(speedInfo.mIsVisible);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRadioButtonClicked(SelectorWithWidgetPreference emiter) {
|
||||
String key = emiter.getKey();
|
||||
log("onRadioButtonClicked(), key:" + key);
|
||||
if (sSpeedKeyMap.containsKey(key)) {
|
||||
mWifiHotspotSpeedViewModel.setSpeedType(sSpeedKeyMap.get(key));
|
||||
}
|
||||
}
|
||||
|
||||
private void log(String msg) {
|
||||
FeatureFactory.getFactory(getContext()).getWifiFeatureProvider().verboseLog(TAG, msg);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user