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

Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbdfa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2123300

Change-Id: Icf6b8698aa4f01e89076fc0566f5d71ef35c1742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-06-15 17:35:36 +00:00
committed by Automerger Merge Worker
parent a5a729f523 79e1afbdfa
commit bef728d2ff
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
View File

@@ -29,6 +29,7 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl
Preference.OnPreferenceChangeListener { Preference.OnPreferenceChangeListener {
private final WifiManager mWifiManager; private final WifiManager mWifiManager;
private boolean mSettingsOn;
public WifiTetherAutoOffPreferenceController(Context context, String preferenceKey) { public WifiTetherAutoOffPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey); super(context, preferenceKey);
@@ -43,9 +44,9 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
SoftApConfiguration softApConfiguration = mWifiManager.getSoftApConfiguration(); SoftApConfiguration softApConfiguration = mWifiManager.getSoftApConfiguration();
final boolean settingsOn = softApConfiguration.isAutoShutdownEnabled(); mSettingsOn = softApConfiguration.isAutoShutdownEnabled();
((SwitchPreference) preference).setChecked(settingsOn); ((SwitchPreference) preference).setChecked(mSettingsOn);
} }
@Override @Override
@@ -56,6 +57,11 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl
new SoftApConfiguration.Builder(softApConfiguration) new SoftApConfiguration.Builder(softApConfiguration)
.setAutoShutdownEnabled(settingsOn) .setAutoShutdownEnabled(settingsOn)
.build(); .build();
mSettingsOn = settingsOn;
return mWifiManager.setSoftApConfiguration(newSoftApConfiguration); return mWifiManager.setSoftApConfiguration(newSoftApConfiguration);
} }
public boolean isEnabled() {
return mSettingsOn;
}
} }

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

@@ -32,7 +32,6 @@ import android.util.FeatureFlagUtils;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceGroup;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
@@ -70,6 +69,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
private WifiTetherPasswordPreferenceController mPasswordPreferenceController; private WifiTetherPasswordPreferenceController mPasswordPreferenceController;
private WifiTetherSecurityPreferenceController mSecurityPreferenceController; private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
private WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController; private WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController;
private WifiTetherAutoOffPreferenceController mWifiTetherAutoOffPreferenceController;
private WifiManager mWifiManager; private WifiManager mWifiManager;
private boolean mRestartWifiApAfterConfigChange; private boolean mRestartWifiApAfterConfigChange;
@@ -117,6 +117,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
mPasswordPreferenceController = use(WifiTetherPasswordPreferenceController.class); mPasswordPreferenceController = use(WifiTetherPasswordPreferenceController.class);
mMaxCompatibilityPrefController = mMaxCompatibilityPrefController =
use(WifiTetherMaximizeCompatibilityPreferenceController.class); use(WifiTetherMaximizeCompatibilityPreferenceController.class);
mWifiTetherAutoOffPreferenceController = use(WifiTetherAutoOffPreferenceController.class);
} }
@Override @Override
@@ -215,6 +216,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
securityType); securityType);
} }
mMaxCompatibilityPrefController.setupMaximizeCompatibility(configBuilder); mMaxCompatibilityPrefController.setupMaximizeCompatibility(configBuilder);
configBuilder.setAutoShutdownEnabled(
mWifiTetherAutoOffPreferenceController.isEnabled());
return configBuilder.build(); return configBuilder.build();
} }