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

Commit d42ff2a8 authored by SongFerngWang's avatar SongFerngWang
Browse files

Device do network scan after user rotates NetworkSelection page 

Add the networkSelectSettings fragment into new activity, and set
the activity's android:configChanges as
"orientation|keyboard|keyboardHidden|screenSize|screenLayout
|smallestScreenSize".

Bug: 204039043
Test: atest AutoSelectPreferenceControllerTest (pass)
atest OpenNetworkSelectPagePreferenceControllerTest (pass)
atest NetworkSelectSettingsTest (pass)

Change-Id: Ic933c2294401bc50e105ddcfd2a17886d0bbefc3
Merged-In: Ic933c2294401bc50e105ddcfd2a17886d0bbefc3
parent 6e12a31e

AndroidManifest.xml

+15 −0
Original line number Diff line number Diff line
@@ -235,6 +235,11 @@ 
                  android:exported="true"

                  android:launchMode="singleTask"

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

            <!-- Note: Since the framework does not support the multiple requests of network scan

            from the UI, this singleTask can protect that there is only one

            Settings$NetworkSelectActivity which can request the network scan.

            If removing the "singleTask" in the future, please also modify the

            Settings$NetworkSelectActivity's structure. -->

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

                <!-- Displays the MobileNetworkActivity and opt-in dialog for capability discovery. -->

                <action android:name="android.telephony.ims.action.SHOW_CAPABILITY_DISCOVERY_OPT_IN" />
@@ -346,6 +351,16 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name="Settings$NetworkSelectActivity"

            android:label="@string/choose_network_title"

            android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout|smallestScreenSize">

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

                android:value="com.android.settings.network.telephony.NetworkSelectSettings" />

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

                android:value="true" />

        </activity>



        <activity

            android:name="Settings$WifiDetailsSettingsActivity"

            android:label="@string/wifi_details_title"

res/xml/mobile_network_settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ 
            <Preference

                android:key="choose_network_key"

                android:title="@string/choose_network_title"

                android:fragment="com.android.phone.NetworkSelectSetting"

                settings:controller="com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController"/>

        </PreferenceCategory>

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 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 */ }

    public static class NetworkSelectActivity 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 */ }

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

+3 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ import com.android.settings.network.NetworkDashboardFragment; 
import com.android.settings.network.NetworkProviderSettings;

import com.android.settings.network.apn.ApnEditor;

import com.android.settings.network.apn.ApnSettings;

import com.android.settings.network.telephony.NetworkSelectSettings;

import com.android.settings.nfc.AndroidBeam;

import com.android.settings.nfc.PaymentSettings;

import com.android.settings.notification.ConfigureNotificationSettings;
@@ -316,6 +317,7 @@ public class SettingsGateway { 
            InteractAcrossProfilesDetails.class.getName(),

            MediaControlsSettings.class.getName(),

            NetworkProviderSettings.class.getName(),

            NetworkSelectSettings.class.getName(),

            AlarmsAndRemindersDetails.class.getName(),

            MediaManagementAppsDetails.class.getName()

    };
@@ -339,6 +341,7 @@ public class SettingsGateway { 
            Settings.WifiSettingsActivity.class.getName(),

            Settings.DataUsageSummaryActivity.class.getName(),

            Settings.NetworkProviderSettingsActivity.class.getName(),

            Settings.NetworkSelectActivity.class.getName(),

            // Home page > Connected devices

            Settings.BluetoothSettingsActivity.class.getName(),

            Settings.WifiDisplaySettingsActivity.class.getName(),

src/com/android/settings/network/telephony/NetworkScanHelper.java

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ public class NetworkScanHelper { 
                    mExecutor,

                    mInternalNetworkScanCallback);

            if (mNetworkScanRequester == null) {

                Log.d(TAG, "mNetworkScanRequester == null");

                onError(NetworkScan.ERROR_RADIO_INTERFACE_ERROR);

            }

        }