Merge "Move LocationServicePreference to Location > LocationServices" into sc-dev am: 6731f0eb7a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13605909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28967dd9c7981c60d21c30a08cc7c8d8ef03af3d
This commit is contained in:
TreeHugger Robot
2021-02-24 02:40:07 +00:00
committed by Automerger Merge Worker
12 changed files with 43 additions and 39 deletions

View File

@@ -1317,7 +1317,7 @@
</activity>
<activity
android:name="Settings$ScanningSettingsActivity"
android:label="@string/location_scanning_screen_title"
android:label="@string/location_services_screen_title"
android:icon="@drawable/ic_homepage_location"
android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
@@ -1326,7 +1326,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.location.ScanningSettings" />
android:value="com.android.settings.location.LocationServices" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>