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

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

Merge "Add a wrapper Activity to launch scanning settings" into pi-dev

parents 6baefa4b f72f8309

AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -1301,6 +1301,22 @@ 
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>

        <activity

            android:name="Settings$ScanningSettingsActivity"

            android:label="@string/location_scanning_screen_title"

            android:icon="@drawable/ic_settings_location"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings">

            <intent-filter android:priority="1">

                <action android:name="android.settings.LOCATION_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.ScanningSettings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity

            android:name=".Settings$SecurityDashboardActivity"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public class Settings extends SettingsActivity { 
    public static class SecurityDashboardActivity extends SettingsActivity { /* empty */ }

    public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ }

    public static class LocationSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ScanningSettingsActivity extends SettingsActivity { /* empty */ }

    public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }

    public static class FactoryResetActivity extends SettingsActivity { /* empty */ }

    public static class RunningServicesActivity extends SettingsActivity { /* empty */ }

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

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ import com.android.settings.inputmethod.UserDictionarySettings; 
import com.android.settings.language.LanguageAndInputSettings;

import com.android.settings.localepicker.LocaleListEditor;

import com.android.settings.location.LocationSettings;

import com.android.settings.location.ScanningSettings;

import com.android.settings.network.ApnEditor;

import com.android.settings.network.ApnSettings;

import com.android.settings.network.NetworkDashboardFragment;
@@ -166,6 +167,7 @@ public class SettingsGateway { 
            ProcessStatsUi.class.getName(),

            NotificationStation.class.getName(),

            LocationSettings.class.getName(),

            ScanningSettings.class.getName(),

            SecuritySettings.class.getName(),

            UsageAccessDetails.class.getName(),

            PrivacySettings.class.getName(),