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

Commit 9066b914 authored by Tom O'Neill's avatar Tom O'Neill Committed by Android (Google) Code Review
Browse files

Merge "Switch to new location mode API recommended by API council" into klp-dev

parents 5d821bed 93259c14

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

+3 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settings.location;



import android.content.ContentQueryMap;

import android.content.ContentResolver;

import android.content.Context;

import android.database.Cursor;

import android.os.UserManager;
@@ -79,13 +78,13 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment { 
        if (um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {

            return;

        }

        Settings.Secure.setLocationMode(getContentResolver(), mode);

        Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCATION_MODE, mode);

        refreshLocationMode();

    }



    public void refreshLocationMode() {

        ContentResolver res = getContentResolver();

        int mode = Settings.Secure.getLocationMode(getContentResolver());

        int mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE,

                Settings.Secure.LOCATION_MODE_OFF);

        onModeChanged(mode);

    }

}

src/com/android/settings/widget/SettingsAppWidgetProvider.java

+3 −2
Original line number Diff line number Diff line
@@ -521,7 +521,8 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { 
        @Override

        public int getActualState(Context context) {

            ContentResolver resolver = context.getContentResolver();

            int currentLocationMode = Settings.Secure.getLocationMode(resolver);

            int currentLocationMode = Settings.Secure.getInt(resolver,

                    Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);

            switch (currentLocationMode) {

                case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:

                case Settings.Secure.LOCATION_MODE_OFF:
@@ -550,7 +551,7 @@ public class SettingsAppWidgetProvider extends AppWidgetProvider { 
                        int mode = desiredState

                                ? Settings.Secure.LOCATION_MODE_HIGH_ACCURACY

                                : Settings.Secure.LOCATION_MODE_BATTERY_SAVING;

                        Settings.Secure.setLocationMode(resolver, mode);

                        Settings.Secure.putInt(resolver, Settings.Secure.LOCATION_MODE, mode);

                        return desiredState;

                    }