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

Commit d8df0d97 authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Move WiFi/Bluetooth scanning toggles to new pages 

Screenshots: http://shortn/_ZmO6y9Zi5S

Bug: 180533061
Test: on device
Change-Id: I1223c9f5641bcc24b3e16af45138643f62849b8b
parent e9355553

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -3186,6 +3186,10 @@ 
    <string name="status_prl_version">PRL version</string>

    <!-- About phone screen, title for MEID for multi-sim devices -->

    <string name="meid_multi_sim">MEID (sim slot %1$d)</string>

    <!-- The status text when (Wi-Fi or Bluetooth) scanning is on. [CHAR LIMIT=100] -->

    <string name="scanning_status_text_on">On</string>

    <!-- The status text when (Wi-Fi or Bluetooth) scanning is off. [CHAR LIMIT=100] -->

    <string name="scanning_status_text_off">Off</string>

    <!-- The status text when both Wi-Fi scanning and Bluetooth scanning are on. [CHAR LIMIT=100] -->

    <string name="scanning_status_text_wifi_on_ble_on">Both Wi\u2011Fi and Bluetooth scanning are on</string>

    <!-- The status text when Wi-Fi scanning is on and Bluetooth scanning are off. [CHAR LIMIT=100] -->

res/xml/location_services.xml

+12 −12
Original line number Diff line number Diff line
@@ -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>

res/xml/location_services_bluetooth_scanning.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?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>

res/xml/location_services_wifi_scanning.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?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>

src/com/android/settings/location/BluetoothScanningFragment.java

0 → 100644
+81 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */



package com.android.settings.location;



import android.app.settings.SettingsEnums;

import android.content.Context;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.search.SearchIndexable;



import java.util.ArrayList;

import java.util.List;



/**

 * A page that configures the Bluetooth scanning setting.

 */

@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

public class BluetoothScanningFragment extends DashboardFragment {

    private static final String TAG = "BluetoothScanningFragment";



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.LOCATION_SERVICES;

    }



    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.location_services_bluetooth_scanning;

    }



    @Override

    protected String getLogTag() {

        return TAG;

    }



    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        return buildPreferenceControllers(context);

    }



    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

    }



    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new BluetoothScanningPreferenceController(context));

        return controllers;

    }



    /**

     * For Search.

     */

    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.location_services_bluetooth_scanning) {



                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(Context

                        context) {

                    return buildPreferenceControllers(context);

                }

            };

}