PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move WiFi/Bluetooth scanning toggles to new pages" into sc-dev am: 041966442f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c5c8efc52b855a9f92d010a244786c4f72b7787
This commit is contained in:
TreeHugger Robot
2021-03-13 03:42:45 +00:00
committed by Automerger Merge Worker
parent 7184295054 041966442f
commit ef44fde1fd
10 changed files with 494 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
res/xml/location_services.xml
View File

@@ -18,21 +18,21 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/location_services_screen_title">
<SwitchPreference
android:title="@string/location_scanning_wifi_always_scanning_title"
android:summary="@string/location_scanning_wifi_always_scanning_description"
android:defaultValue="true"
android:key="wifi_always_scanning" />
<SwitchPreference
android:title="@string/location_scanning_bluetooth_always_scanning_title"
android:summary="@string/location_scanning_bluetooth_always_scanning_description"
android:defaultValue="true"
android:key="bluetooth_always_scanning" />
<PreferenceCategory
android:key="location_services"
android:layout="@layout/preference_category_no_label"
settings:controller="com.android.settings.location.LocationInjectedServicesPreferenceController"/>
<Preference
android:fragment="com.android.settings.location.WifiScanningFragment"
android:key="location_services_wifi_scanning"
android:title="@string/location_scanning_wifi_always_scanning_title"
settings:controller="com.android.settings.location.LocationServicesWifiScanningPreferenceController"/>
<Preference
android:fragment="com.android.settings.location.BluetoothScanningFragment"
android:key="location_services_bluetooth_scanning"
android:title="@string/location_scanning_bluetooth_always_scanning_title"
settings:controller="com.android.settings.location.LocationServicesBluetoothScanningPreferenceController"/>
</PreferenceScreen>

32
res/xml/location_services_bluetooth_scanning.xml Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/location_scanning_bluetooth_always_scanning_title">
<com.android.settingslib.widget.MainSwitchPreference
android:key="bluetooth_always_scanning_switch"
android:title="@string/location_scanning_bluetooth_always_scanning_title"
settings:controller="com.android.settings.location.BluetoothScanningMainSwitchPreferenceController"/>
<com.android.settingslib.widget.FooterPreference
android:key="bluetooth_always_scanning_footer"
android:title="@string/location_scanning_bluetooth_always_scanning_description"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen>

32
res/xml/location_services_wifi_scanning.xml Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/location_scanning_wifi_always_scanning_title">
<com.android.settingslib.widget.MainSwitchPreference
android:key="wifi_always_scanning_switch"
android:title="@string/location_scanning_wifi_always_scanning_title"
settings:controller="com.android.settings.location.WifiScanningMainSwitchPreferenceController"/>
<com.android.settingslib.widget.FooterPreference
android:key="wifi_always_scanning_footer"
android:title="@string/location_scanning_wifi_always_scanning_description"
android:selectable="false"
settings:searchable="false"/>
</PreferenceScreen>