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

Commit 89215be1 authored by Bruno Martins's avatar Bruno Martins
Browse files

profiles: Goodbye GPS, welcome Location services 

Fixes: https://gitlab.com/LineageOS/issues/android/-/issues/1820
Change-Id: I7534f601e8cbe27153b2c639897d4eb0a0040d98
parent e39e62d4

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ 
    <string name="toggleWifi">Wi\u2011Fi</string>

    <string name="toggleWifiAp">Portable Wi\u2011Fi hotspot</string>

    <string name="toggleBluetooth">Bluetooth</string>

    <string name="toggleGPS">GPS</string>

    <string name="toggleLocation">Location</string>

    <string name="toggleData">Data connection</string>

    <string name="toggleSync">Auto-sync data</string>

    <string name="toggleNfc">NFC</string>

src/org/lineageos/lineageparts/profiles/SetupActionsFragment.java

+5 −7
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ import java.util.ArrayList; 
import java.util.List;



import static lineageos.profiles.ConnectionSettings.PROFILE_CONNECTION_BLUETOOTH;

import static lineageos.profiles.ConnectionSettings.PROFILE_CONNECTION_GPS;

import static lineageos.profiles.ConnectionSettings.PROFILE_CONNECTION_LOCATION;

import static lineageos.profiles.ConnectionSettings.PROFILE_CONNECTION_MOBILEDATA;

import static lineageos.profiles.ConnectionSettings.PROFILE_CONNECTION_NFC;

import static lineageos.profiles.ConnectionSettings.PROFILE_CONNECTION_SYNC;
@@ -218,7 +218,7 @@ public class SetupActionsFragment extends SettingsPreferenceFragment 
            mItems.add(new ConnectionOverrideItem(PROFILE_CONNECTION_BLUETOOTH,

                    mProfile.getSettingsForConnection(PROFILE_CONNECTION_BLUETOOTH)));

        }

        mItems.add(generateConnectionOverrideItem(PROFILE_CONNECTION_GPS));

        mItems.add(generateConnectionOverrideItem(PROFILE_CONNECTION_LOCATION));

        mItems.add(generateConnectionOverrideItem(PROFILE_CONNECTION_WIFI));

        mItems.add(generateConnectionOverrideItem(PROFILE_CONNECTION_SYNC));

        if (DeviceUtils.deviceSupportsMobileData(getActivity())) {
@@ -393,13 +393,11 @@ public class SetupActionsFragment extends SettingsPreferenceFragment 
                            true));

        }



        // gps

        // location

        LocationManager locationManager = context.getSystemService(LocationManager.class);

        boolean gpsEnabled = locationManager.

                isProviderEnabled(LocationManager.GPS_PROVIDER);

        profile.setConnectionSettings(

                new ConnectionSettings(ConnectionSettings.PROFILE_CONNECTION_GPS,

                        gpsEnabled ? 1 : 0, true));

                new ConnectionSettings(ConnectionSettings.PROFILE_CONNECTION_LOCATION,

                        locationManager.isLocationEnabled() ? 1 : 0, true));



        // wifi

        WifiManager wifiManager = context.getSystemService(WifiManager.class);

src/org/lineageos/lineageparts/profiles/actions/item/ConnectionOverrideItem.java

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ public class ConnectionOverrideItem extends Item { 
                return R.string.toggleBluetooth;

            case ConnectionSettings.PROFILE_CONNECTION_MOBILEDATA:

                return R.string.toggleData;

            case ConnectionSettings.PROFILE_CONNECTION_GPS:

                return R.string.toggleGPS;

            case ConnectionSettings.PROFILE_CONNECTION_LOCATION:

                return R.string.toggleLocation;

            case ConnectionSettings.PROFILE_CONNECTION_NFC:

                return R.string.toggleNfc;

            case ConnectionSettings.PROFILE_CONNECTION_SYNC: