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

Commit 9294fdb6 authored by Lifu Tang's avatar Lifu Tang
Browse files

Shows correct state when location sharing disabled 

- Fix b/10553306

Change-Id: I01f69aaeb79e18ddf29da5aef7ea00938e674429
parent 6dde146d

src/com/android/settings/location/LocationSettings.java

+5 −2
Original line number Diff line number Diff line
@@ -233,9 +233,12 @@ public class LocationSettings extends LocationSettingsBase 
                break;

        }



        boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF) && !restricted;

        // Restricted user can't change the location mode, so disable the master switch. But in some

        // corner cases, the location might still be enabled. In such case the master switch should

        // be disabled but checked.

        boolean enabled = (mode != Settings.Secure.LOCATION_MODE_OFF);

        mSwitch.setEnabled(!restricted);

        mLocationMode.setEnabled(enabled);

        mLocationMode.setEnabled(enabled && !restricted);



        if (enabled != mSwitch.isChecked()) {

            // set listener to null so that that code below doesn't trigger onCheckedChanged()