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

Commit e6cb7345 authored by Quang Luong's avatar Quang Luong Committed by Android (Google) Code Review
Browse files

Merge "Added WifiSettings -> WifiSettings2 redirection behind feature flag"

parents 0d5f5b16 b470e725

Android.bp

+1 −0
Original line number Diff line number Diff line 
java_library {

    name: "settings-logtags",

    srcs: ["src/**/*.logtags"],

    static_libs: ["WifiTrackerLib"],

}



// Build the Settings APK

AndroidManifest.xml

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

        </activity>



        <activity

            android:name="Settings$WifiSettings2Activity"

            android:label="@string/wifi_settings"

            android:icon="@drawable/ic_settings_wireless"

            android:configChanges="orientation|keyboardHidden|screenSize"

            android:parentActivityName="Settings">

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

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

                <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" />

            </intent-filter>

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

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

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

                       android:value="true" />

        </activity>



        <activity

            android:name=".wifi.WifiPickerActivity"

            android:parentActivityName="Settings">

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ public class Settings extends SettingsActivity { 
    public static class PrivateVolumeSettingsActivity 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 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

+3 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ import com.android.settings.wifi.ConfigureWifiSettings; 
import com.android.settings.wifi.WifiAPITest;

import com.android.settings.wifi.WifiInfo;

import com.android.settings.wifi.WifiSettings;

import com.android.settings.wifi.WifiSettings2;

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

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

import com.android.settings.wifi.p2p.WifiP2pSettings;
@@ -157,6 +158,7 @@ public class SettingsGateway { 
            AdvancedConnectedDeviceDashboardFragment.class.getName(),

            CreateShortcut.class.getName(),

            WifiSettings.class.getName(),

            WifiSettings2.class.getName(),

            ConfigureWifiSettings.class.getName(),

            SavedAccessPointsWifiSettings.class.getName(),

            SimSettings.class.getName(),
@@ -301,6 +303,7 @@ public class SettingsGateway { 
            SupportDashboardActivity.class.getName(),

            // Home page > Network & Internet

            Settings.WifiSettingsActivity.class.getName(),

            Settings.WifiSettings2Activity.class.getName(),

            Settings.DataUsageSummaryActivity.class.getName(),

            // Home page > Connected devices

            Settings.BluetoothSettingsActivity.class.getName(),

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

+6 −0
Original line number Diff line number Diff line
@@ -224,6 +224,12 @@ public class WifiSettings extends RestrictedSettingsFragment 
    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);



        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {

            getContext().startActivity(new Intent("android.settings.WIFI_SETTINGS2"));

            finish();

            return;

        }



        // TODO(b/37429702): Add animations and preference comparator back after initial screen is

        // loaded (ODR).

        setAnimationAllowed(false);