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

Commit 2a87acf2 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev

parents 538af552 1fe8220a

AndroidManifest.xml

+20 −0
Original line number Diff line number Diff line
@@ -299,6 +299,26 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name="Settings$WifiDetailsSettingsActivity"

            android:label="@string/wifi_details_title"

            android:icon="@drawable/ic_homepage_network"

            android:exported="true"

            android:permission="android.permission.CHANGE_WIFI_STATE"

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

            <!-- The intent action is only public to OEM, because a special library is required. -->

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

                <action android:name="android.settings.WIFI_DETAILS_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.details.WifiNetworkDetailsFragment" />

            <meta-data

                android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity

            android:name=".wifi.WifiPickerActivity"

            android:exported="true">

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ public class Settings extends SettingsActivity { 
    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 */ }

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

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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ import com.android.settings.wifi.WifiInfo; 
import com.android.settings.wifi.WifiSettings;

import com.android.settings.wifi.calling.WifiCallingDisclaimerFragment;

import com.android.settings.wifi.calling.WifiCallingSettings;

import com.android.settings.wifi.details.WifiNetworkDetailsFragment;

import com.android.settings.wifi.p2p.WifiP2pSettings;

import com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2;

import com.android.settings.wifi.tether.WifiTetherSettings;
@@ -173,6 +174,7 @@ public class SettingsGateway { 
            AdvancedConnectedDeviceDashboardFragment.class.getName(),

            CreateShortcut.class.getName(),

            WifiSettings.class.getName(),

            WifiNetworkDetailsFragment.class.getName(),

            ConfigureWifiSettings.class.getName(),

            SavedAccessPointsWifiSettings2.class.getName(),

            AllInOneTetherSettings.class.getName(),

src/com/android/settings/network/NetworkProviderSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ import com.android.settings.wifi.WifiConnectListener; 
import com.android.settings.wifi.WifiDialog2;

import com.android.settings.wifi.WifiPickerTrackerHelper;

import com.android.settings.wifi.WifiUtils;

import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;

import com.android.settings.wifi.details.WifiNetworkDetailsFragment;

import com.android.settings.wifi.dpp.WifiDppUtils;

import com.android.settingslib.HelpUtils;

import com.android.settingslib.RestrictedLockUtils;
@@ -929,11 +929,11 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
                        : context.getText(R.string.pref_title_network_details);



        final Bundle bundle = new Bundle();

        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());

        bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());



        new SubSettingLauncher(context)

                .setTitleText(title)

                .setDestination(WifiNetworkDetailsFragment2.class.getName())

                .setDestination(WifiNetworkDetailsFragment.class.getName())

                .setArguments(bundle)

                .setSourceMetricsCategory(getMetricsCategory())

                .launch();
@@ -1184,7 +1184,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 


    private void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {

        final Bundle bundle = new Bundle();

        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,

        bundle.putString(WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY,

                wifiEntry.getKey());

        new SubSettingLauncher(getContext())

                .setTitleText(wifiEntry.getTitle())

src/com/android/settings/wifi/ConfigureWifiEntryFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import androidx.annotation.VisibleForTesting; 
import com.android.settings.R;

import com.android.settings.core.InstrumentedFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;

import com.android.settings.wifi.details.WifiNetworkDetailsFragment;

import com.android.wifitrackerlib.NetworkDetailsTracker;

import com.android.wifitrackerlib.WifiEntry;
@@ -238,6 +238,6 @@ public class ConfigureWifiEntryFragment extends InstrumentedFragment implements 
                        MAX_SCAN_AGE_MILLIS,

                        SCAN_INTERVAL_MILLIS,

                        getArguments().getString(

                                WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY));

                                WifiNetworkDetailsFragment.KEY_CHOSEN_WIFIENTRY_KEY));

    }

}