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

Merge "Hide new Hotspot preferences if feature is disabled" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-12 04:55:54 +00:00
committed by Android (Google) Code Review
parent a6678ad6f6 675b817c49
commit 0373a46e81
2 changed files with 127 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -371,12 +371,20 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
|| !mWifiRestriction.isHotspotAvailable(context)) {
keys.add(KEY_WIFI_TETHER_NETWORK_NAME);
keys.add(KEY_WIFI_TETHER_SECURITY);
keys.add(KEY_WIFI_HOTSPOT_SECURITY);
keys.add(KEY_WIFI_TETHER_NETWORK_PASSWORD);
keys.add(KEY_WIFI_TETHER_AUTO_OFF);
keys.add(KEY_WIFI_TETHER_MAXIMIZE_COMPATIBILITY);
keys.add(KEY_WIFI_HOTSPOT_SPEED);
keys.add(KEY_INSTANT_HOTSPOT);
} else if (!mIsInstantHotspotEnabled) {
keys.add(KEY_INSTANT_HOTSPOT);
} else {
if (!isSpeedFeatureAvailable()) {
keys.add(KEY_WIFI_HOTSPOT_SECURITY);
keys.add(KEY_WIFI_HOTSPOT_SPEED);
}
if (!mIsInstantHotspotEnabled) {
keys.add(KEY_INSTANT_HOTSPOT);
}
}
// Remove duplicate
@@ -400,6 +408,12 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, null /* listener */);
}
@VisibleForTesting
boolean isSpeedFeatureAvailable() {
return FeatureFactory.getFeatureFactory().getWifiFeatureProvider()
.getWifiHotspotRepository().isSpeedFeatureAvailable();
}
}
@VisibleForTesting