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

Commit 69df0120 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the CtsVerifier issue" into sc-v2-dev am: 0d96dc50 am: e837096e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16241533

Change-Id: Id31d0aa8a6a50ca8d4b7c997b06ee86b19e0866e
parents ff0058b2 e837096e

AndroidManifest.xml

+18 −16
Original line number Diff line number Diff line
@@ -314,8 +314,12 @@ 
            android:icon="@drawable/ic_homepage_network"

            android:exported="true"

            android:configChanges="orientation|keyboardHidden|screenSize">

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

                <action android:name="android.settings.WIFI_SETTINGS"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

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

                android:value="com.android.settings.wifi.WifiSettings" />

                       android:value="com.android.settings.network.NetworkProviderSettings"/>

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

                       android:value="@string/menu_key_network"/>

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -330,9 +334,11 @@ 
            android:icon="@drawable/ic_homepage_network"

            android:exported="true">

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

                android:value="com.android.settings.wifi.WifiSettings" />

                       android:value="com.android.settings.network.NetworkProviderSettings"/>

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

                       android:value="@string/menu_key_network"/>

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

                       android:value="true"/>

        </activity-alias>



        <activity
@@ -345,10 +351,6 @@ 
                <action android:name="android.settings.NETWORK_PROVIDER_SETTINGS"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

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

                <action android:name="android.settings.WIFI_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="com.android.settings.SHORTCUT"/>

src/com/android/settings/Settings.java

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

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

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

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

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

    /** Activity for the Wi-Fi network details settings. */

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