commit 963195cd885f81a364482f3224ba769d40bbef00
author Oliver Scott <olivercscott@gmail.com> Fri Apr 28 12:48:02 2023 -0400
committer Michael Bestas <mkbestas@lineageos.org> Tue Jun 06 22:10:00 2023 +0200
tree 31edc5bd4334662cb6524b08254340852222c68d
parent 4c8cc2f348b8536be71d16450877b7f0410cf953

Apply location settings on Next button press

Change-Id: I330aefc2ba3b4cfed5a5cc753fed11f6881e3ca0

src/org/lineageos/setupwizard/LocationSettingsActivity.java

diff --git a/src/org/lineageos/setupwizard/LocationSettingsActivity.java b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
index 3a0bac3..e4ca1af 100644
--- a/src/org/lineageos/setupwizard/LocationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
@@ -46,12 +46,6 @@
         View locationAccessView = findViewById(R.id.location);
         locationAccessView.setOnClickListener(v -> {
             mLocationAccess.setChecked(!mLocationAccess.isChecked());
-            mLocationManager.setLocationEnabledForUser(mLocationAccess.isChecked(),
-                    Process.myUserHandle());
-            if (mUserManager.isManagedProfile()) {
-                mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION,
-                        !mLocationAccess.isChecked());
-            }
         });
     }
 
@@ -66,6 +60,17 @@
     }
 
     @Override
+    protected void onNextPressed() {
+        mLocationManager.setLocationEnabledForUser(mLocationAccess.isChecked(),
+                Process.myUserHandle());
+        if (mUserManager.isManagedProfile()) {
+            mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION,
+                    !mLocationAccess.isChecked());
+        }
+        super.onNextPressed();
+    }
+
+    @Override
     protected int getLayoutResId() {
         return R.layout.location_settings;
     }