From e93c1298fcb1a239775a5fb7f7d537491e217a05 Mon Sep 17 00:00:00 2001 From: Yu-Han Yang Date: Wed, 17 Feb 2021 13:52:39 -0800 Subject: [PATCH] Move LocationServicePreference to Location > LocationServices Bug: 180533061 Test: manual on device Change-Id: Idd700f5c530af67f4936e207e42988267185f256 --- AndroidManifest.xml | 4 ++-- res/values/strings.xml | 4 ++-- ...ion_scanning.xml => location_services.xml} | 8 +++++++- res/xml/location_settings.xml | 11 +++------- res/xml/location_settings_personal.xml | 11 +++------- .../BluetoothSwitchPreferenceController.java | 4 ++-- .../core/gateway/SettingsGateway.java | 4 ++-- .../location/LocationPersonalSettings.java | 3 ++- ...ingSettings.java => LocationServices.java} | 20 +++++++++++++------ .../settings/location/LocationSettings.java | 1 - .../android/settings/wifi/WifiSettings.java | 6 +++--- ...ngsTest.java => LocationServicesTest.java} | 6 +++--- 12 files changed, 43 insertions(+), 39 deletions(-) rename res/xml/{location_scanning.xml => location_services.xml} (78%) rename src/com/android/settings/location/{ScanningSettings.java => LocationServices.java} (79%) rename tests/robotests/src/com/android/settings/location/{ScanningSettingsTest.java => LocationServicesTest.java} (91%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cfda9b75e6b..6627d9e8b96 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1315,7 +1315,7 @@ @@ -1324,7 +1324,7 @@ + android:value="com.android.settings.location.LocationServices" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index ad7fe3c00a8..6bb7604788e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4007,8 +4007,6 @@ High battery use Low battery use - - Wi\u2011Fi and Bluetooth scanning Wi\u2011Fi scanning @@ -4017,6 +4015,8 @@ Bluetooth scanning Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services. + + Location Services Location services for work diff --git a/res/xml/location_scanning.xml b/res/xml/location_services.xml similarity index 78% rename from res/xml/location_scanning.xml rename to res/xml/location_services.xml index f82500bf8e9..7096d2cd3f2 100644 --- a/res/xml/location_scanning.xml +++ b/res/xml/location_services.xml @@ -15,7 +15,8 @@ --> + xmlns:settings="http://schemas.android.com/apk/res-auto" + android:title="@string/location_services_screen_title"> + + diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml index fb03f4c7f3d..733105843af 100644 --- a/res/xml/location_settings.xml +++ b/res/xml/location_settings.xml @@ -50,9 +50,9 @@ @@ -65,11 +65,6 @@ settings:forWork="true" settings:useAdminDisabledSummary="true"/> - - - - + android:title="@string/location_services_screen_title" + android:fragment="com.android.settings.location.LocationServices" + settings:controller="com.android.settings.location.LocationScanningPreferenceController"/> buildPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); controllers.add(new WifiScanningPreferenceController(context)); @@ -66,7 +74,7 @@ public class ScanningSettings extends DashboardFragment { * For Search. */ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.location_scanning) { + new BaseSearchIndexProvider(R.xml.location_services) { @Override public List createPreferenceControllers(Context diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index b4f0f1f1c11..8d862d4cd27 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -83,7 +83,6 @@ public class LocationSettings extends DashboardFragment { use(AppLocationPermissionPreferenceController.class).init(this); use(RecentLocationRequestPreferenceController.class).init(this); - use(LocationServicePreferenceController.class).init(this); use(LocationFooterPreferenceController.class).init(this); use(LocationForWorkPreferenceController.class).init(this); use(LocationServiceForWorkPreferenceController.class).init(this); diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 34067e993bb..5545de6ced8 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -63,7 +63,7 @@ import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.DataUsagePreference; import com.android.settings.datausage.DataUsageUtils; -import com.android.settings.location.ScanningSettings; +import com.android.settings.location.LocationServices; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.widget.MainSwitchBarController; @@ -921,8 +921,8 @@ public class WifiSettings extends RestrictedSettingsFragment : getText(R.string.wifi_scan_notify_text_scanning_off); final LinkifyUtils.OnClickListener clickListener = () -> new SubSettingLauncher(getContext()) - .setDestination(ScanningSettings.class.getName()) - .setTitleRes(R.string.location_scanning_screen_title) + .setDestination(LocationServices.class.getName()) + .setTitleRes(R.string.location_services_screen_title) .setSourceMetricsCategory(getMetricsCategory()) .launch(); mStatusMessagePreference.setText(title, description, clickListener); diff --git a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java b/tests/robotests/src/com/android/settings/location/LocationServicesTest.java similarity index 91% rename from tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java rename to tests/robotests/src/com/android/settings/location/LocationServicesTest.java index 649726a0bd3..f11584583d7 100644 --- a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicesTest.java @@ -32,7 +32,7 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; @RunWith(RobolectricTestRunner.class) -public class ScanningSettingsTest { +public class LocationServicesTest { private Context mContext; @@ -43,10 +43,10 @@ public class ScanningSettingsTest { @Test public void searchProvider_shouldIndexDefaultXml() { - final List sir = ScanningSettings.SEARCH_INDEX_DATA_PROVIDER + final List sir = LocationServices.SEARCH_INDEX_DATA_PROVIDER .getXmlResourcesToIndex(mContext, true /* enabled */); assertThat(sir).hasSize(1); - assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_scanning); + assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_services); } }