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

Add Instant hotspot preference

Browse Source 
- Add Instant hotspot preference to Wi-Fi hotspot settings

- Wait onServiceConnected callback and then getSettingsState

- Use the PendingIntent provided by SharedConnectivitySettingsState to launch Instant hotspot settings

Bug: 268550769
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
         SharedConnectivityRepositoryTest

Change-Id: I343599e6127d9b1cb4af661dcc80a8683589c7b8
This commit is contained in:
Weng Su
2023-08-15 22:22:23 +08:00
parent 4957e2d000
commit 63321a1a83
9 changed files with 581 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
static final String KEY_WIFI_HOTSPOT_SECURITY = "wifi_hotspot_security";
@VisibleForTesting
static final String KEY_WIFI_HOTSPOT_SPEED = "wifi_hotspot_speed";
@VisibleForTesting
static final String KEY_INSTANT_HOTSPOT = "wifi_hotspot_instant";
@VisibleForTesting
SettingsMainSwitchBar mMainSwitchBar;
@@ -103,6 +105,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
Preference mWifiHotspotSecurity;
@VisibleForTesting
Preference mWifiHotspotSpeed;
@VisibleForTesting
Preference mInstantHotspot;
static {
TETHER_STATE_CHANGE_FILTER = new IntentFilter(WIFI_AP_STATE_CHANGED_ACTION);
@@ -148,6 +152,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
.getWifiTetherViewModel(this);
if (mWifiTetherViewModel != null) {
setupSpeedFeature(mWifiTetherViewModel.isSpeedFeatureAvailable());
setupInstantHotspot(mWifiTetherViewModel.isInstantHotspotFeatureAvailable());
mWifiTetherViewModel.getRestarting().observe(this, this::onRestartingChanged);
}
}
@@ -167,6 +172,24 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
}
}
@VisibleForTesting
void setupInstantHotspot(boolean isFeatureAvailable) {
if (!isFeatureAvailable) {
return;
}
mInstantHotspot = findPreference(KEY_INSTANT_HOTSPOT);
if (mInstantHotspot == null) {
Log.e(TAG, "Failed to find Instant Hotspot preference:" + KEY_INSTANT_HOTSPOT);
return;
}
mWifiTetherViewModel.getInstantHotspotSummary()
.observe(this, this::onInstantHotspotChanged);
mInstantHotspot.setOnPreferenceClickListener(p -> {
mWifiTetherViewModel.launchInstantHotspotSettings();
return true;
});
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
@@ -279,6 +302,16 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
setLoading(restarting, false);
}
@VisibleForTesting
void onInstantHotspotChanged(String summary) {
if (summary == null) {
mInstantHotspot.setVisible(false);
return;
}
mInstantHotspot.setVisible(true);
mInstantHotspot.setSummary(summary);
}
@VisibleForTesting
SoftApConfiguration buildNewConfig() {
SoftApConfiguration currentConfig = mWifiTetherViewModel.getSoftApConfiguration();