Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b27a4e2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Keep setting of "TurnOff hotspot automatically" when AP is changed" am: 79e1afbd am: bef728d2 am: 3682ed9f

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



Change-Id: I5a857be001a9ef641299b3f849c141b45d5b6664
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 844417c1 3682ed9f

src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java

+8 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl 
        Preference.OnPreferenceChangeListener {



    private final WifiManager mWifiManager;

    private boolean mSettingsOn;



    public WifiTetherAutoOffPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);
@@ -43,9 +44,9 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl 
    @Override

    public void updateState(Preference preference) {

        SoftApConfiguration softApConfiguration = mWifiManager.getSoftApConfiguration();

        final boolean settingsOn = softApConfiguration.isAutoShutdownEnabled();

        mSettingsOn = softApConfiguration.isAutoShutdownEnabled();



        ((SwitchPreference) preference).setChecked(settingsOn);

        ((SwitchPreference) preference).setChecked(mSettingsOn);

    }



    @Override
@@ -56,6 +57,11 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl 
                new SoftApConfiguration.Builder(softApConfiguration)

                        .setAutoShutdownEnabled(settingsOn)

                        .build();

        mSettingsOn = settingsOn;

        return mWifiManager.setSoftApConfiguration(newSoftApConfiguration);

    }



    public boolean isEnabled() {

        return mSettingsOn;

    }

}

src/com/android/settings/wifi/tether/WifiTetherSettings.java

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment 
    private WifiTetherPasswordPreferenceController mPasswordPreferenceController;

    private WifiTetherSecurityPreferenceController mSecurityPreferenceController;

    private WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController;

    private WifiTetherAutoOffPreferenceController mWifiTetherAutoOffPreferenceController;



    private WifiManager mWifiManager;

    private boolean mRestartWifiApAfterConfigChange;
@@ -122,6 +123,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment 
        mPasswordPreferenceController = use(WifiTetherPasswordPreferenceController.class);

        mMaxCompatibilityPrefController =

                use(WifiTetherMaximizeCompatibilityPreferenceController.class);

        mWifiTetherAutoOffPreferenceController = use(WifiTetherAutoOffPreferenceController.class);

    }



    @Override
@@ -226,6 +228,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment 
                    securityType);

        }

        mMaxCompatibilityPrefController.setupMaximizeCompatibility(configBuilder);

        configBuilder.setAutoShutdownEnabled(

                mWifiTetherAutoOffPreferenceController.isEnabled());

        return configBuilder.build();

    }