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

Commit aea57bab authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android (Google) Code Review
Browse files

Merge "Forward WiFi settings intents to primary profile" into mnc-dev

parents f09497a2 e03d8862

AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ 
                android:value="com.android.settings.wifi.WifiSettings" />

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

                android:resource="@id/wifi_settings" />

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

                android:value="true" />

        </activity>



        <!-- Keep compatibility with old shortcuts. -->
@@ -217,6 +219,8 @@ 
                <action android:name="android.intent.action.MAIN" />

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

            </intent-filter>

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

                android:value="true" />

        </activity>



        <activity android:name=".wifi.WifiSetupActivity"
@@ -230,6 +234,8 @@ 
                <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />

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

            </intent-filter>

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

                android:value="true" />

        </activity>



        <activity android:name="Settings$AdvancedWifiSettingsActivity"
@@ -250,6 +256,8 @@ 
                android:value="com.android.settings.wifi.AdvancedWifiSettings" />

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

                android:resource="@id/wifi_settings" />

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

                android:value="true" />

        </activity>



        <activity android:name="Settings$SavedAccessPointsSettingsActivity"
@@ -269,6 +277,8 @@ 
                android:value="com.android.settings.wifi.SavedAccessPointsSettings" />

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

                android:resource="@id/wifi_settings" />

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

                android:value="true" />

        </activity>



        <activity android:name=".wifi.WifiInfo"
@@ -322,6 +332,8 @@ 
                <action android:name="android.net.conn.PROMPT_UNVALIDATED" />

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

            </intent-filter>

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

                android:value="true" />

        </activity>



        <!-- Suspect activity alias: targetActivity is Settings itself, does not define a name. Remove? -->