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

Commit 0bf1802b authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge SP1A.211205.008"

parents a3d97ecd 971abb19
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -1420,6 +1420,23 @@
                android:value="true" />
        </activity>

        <activity
            android:name="Settings$WifiScanningSettingsActivity"
            android:label="@string/location_scanning_wifi_always_scanning_title"
            android:icon="@drawable/ic_homepage_location"
            android:exported="true"
            android:permission="android.permission.CHANGE_WIFI_STATE"
            android:configChanges="orientation|keyboardHidden|screenSize">
            <intent-filter android:priority="1">
                <action android:name="android.settings.WIFI_SCANNING_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.location.WifiScanningFragment" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                       android:value="true" />
        </activity>

        <activity
            android:name=".Settings$SecurityDashboardActivity"
            android:label="@string/security_settings_title"
+3 −0
Original line number Diff line number Diff line
@@ -13410,6 +13410,9 @@
    <string name="default_active_sim_sms">SMS</string>
    <!-- Provider Model: summary of default mobile data. [CHAR LIMIT=50] -->
    <string name="default_active_sim_mobile_data">mobile data</string>
    <!-- Provider Model: Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off and Wi-Fi
    scanning is on. To mark a link to bring the user to "scanning settings" screen. [CHAR LIMIT=NONE]-->
    <string name="wifi_scan_notify_message">To improve device experience, 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 Wi\u2011Fi scanning settings. <annotation id="link">Change</annotation></string>
    <!-- Summary text separator for preferences including a short description
         (eg. "Connected / 5G"). [CHAR LIMIT=50] -->
+6 −0
Original line number Diff line number Diff line
@@ -81,4 +81,10 @@
    <com.android.settings.datausage.DataUsagePreference
        android:key="non_carrier_data_usage"
        android:title="@string/non_carrier_data_usage"/>

    <com.android.settingslib.widget.FooterPreference
        android:key="wifi_status_message_footer"
        android:selectable="false"
        settings:allowDividerAbove="false"
        settings:searchable="false"/>
</PreferenceScreen>
+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ public class Settings extends SettingsActivity {
    public static class AppUsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
    public static class LocationSettingsActivity extends SettingsActivity { /* empty */ }
    public static class ScanningSettingsActivity extends SettingsActivity { /* empty */ }
    public static class WifiScanningSettingsActivity extends SettingsActivity { /* empty */ }
    public static class PrivacyDashboardActivity extends SettingsActivity { /* empty */ }
    public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
    public static class FactoryResetActivity extends SettingsActivity {
+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ import com.android.settings.language.LanguageAndInputSettings;
import com.android.settings.localepicker.LocaleListEditor;
import com.android.settings.location.LocationServices;
import com.android.settings.location.LocationSettings;
import com.android.settings.location.WifiScanningFragment;
import com.android.settings.network.MobileNetworkListFragment;
import com.android.settings.network.NetworkDashboardFragment;
import com.android.settings.network.NetworkProviderSettings;
@@ -202,6 +203,7 @@ public class SettingsGateway {
            ProcessStatsUi.class.getName(),
            NotificationStation.class.getName(),
            LocationSettings.class.getName(),
            WifiScanningFragment.class.getName(),
            PrivacyDashboardFragment.class.getName(),
            LocationServices.class.getName(),
            SecuritySettings.class.getName(),
Loading