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

Commit 8d07eeb5 authored by Yu-Han Yang's avatar Yu-Han Yang Committed by Android (Google) Code Review
Browse files

Merge "Update links to Scanning Settings" into sc-dev

parents 383ae7f0 109d9bb2

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ 
    <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->

    <string name="bluetooth_empty_list_bluetooth_off">When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices.</string>

    <!-- Bluetooth settings. Text displayed when Bluetooth is off and bluetooth scanning is turned on [CHAR LIMIT=NONE] -->

    <string name="bluetooth_scanning_on_info_message">When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices.\n\nTo improve device experience, apps and services can still 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. you can change this in <annotation id="link">scanning settings</annotation>.</string>

    <string name="bluetooth_scanning_on_info_message">When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices.\n\nTo improve device experience, apps and services can still 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. you can change this in <annotation id="link">Bluetooth scanning settings</annotation>.</string>

    <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The

      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring

      the user to "scanning settings" screen. -->
@@ -1981,13 +1981,13 @@ 
    <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off and Wi-Fi

      scanning is on. The place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They

      mark a link to bring the user to "scanning settings" screen. -->

    <string name="wifi_scan_notify_text">To improve location accuracy, apps and services can still scan for Wi\u2011Fi networks at any time, even when Wi\u2011Fi is off. This can be used, for example, to improve location-based features and services. You can change this in <xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>

    <string name="wifi_scan_notify_text">To improve location accuracy, apps and services can still scan for Wi\u2011Fi networks at any time, even when Wi\u2011Fi is off. This can be used, for example, to improve location-based features and services. You can change this in <xliff:g id="link_begin">LINK_BEGIN</xliff:g>Wi\u2011Fi scanning settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>

    <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off and Wi-Fi

      scanning is also off. The place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated.

      They mark a link to bring the user to "scanning settings" screen. -->

    <string name="wifi_scan_notify_text_scanning_off">To improve location accuracy,

        turn on Wi-Fi scanning in

        <xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning

        <xliff:g id="link_begin">LINK_BEGIN</xliff:g>Wi\u2011Fi scanning

        settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>

    <!-- Wifi scan always mode checkbox text -->

    <string name="wifi_scan_notify_remember_choice">Don\u2019t show again</string>

src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import androidx.annotation.VisibleForTesting; 


import com.android.settings.R;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.location.LocationServices;

import com.android.settings.location.BluetoothScanningFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.utils.AnnotationSpan;

import com.android.settings.widget.SwitchWidgetController;
@@ -100,7 +100,7 @@ public class BluetoothSwitchPreferenceController 
    public void onClick(View v) {

        // send users to scanning settings if they click on the link in the summary text

        new SubSettingLauncher(mContext)

                .setDestination(LocationServices.class.getName())

                .setDestination(BluetoothScanningFragment.class.getName())

                .setSourceMetricsCategory(SettingsEnums.BLUETOOTH_FRAGMENT)

                .launch();

    }

src/com/android/settings/wifi/WifiSettings.java

+3 −3
Original line number Diff line number Diff line
@@ -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.LocationServices;

import com.android.settings.location.WifiScanningFragment;

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(LocationServices.class.getName())

                        .setTitleRes(R.string.location_services_screen_title)

                        .setDestination(WifiScanningFragment.class.getName())

                        .setTitleRes(R.string.location_scanning_wifi_always_scanning_title)

                        .setSourceMetricsCategory(getMetricsCategory())

                        .launch();

        mStatusMessagePreference.setText(title, description, clickListener);