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

Commit 28b7d115 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev

parents c0b9f4bd 9e6966d1

AndroidManifest.xml

+17 −0
Original line number Diff line number Diff line
@@ -1397,6 +1397,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"

src/com/android/settings/Settings.java

+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 {

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,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;
@@ -201,6 +202,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(),