Merge "Device do network scan after user rotates NetworkSelection page" (990b4c46) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+15 −0

Original line number	Diff line number	Diff line
		@@ -234,6 +234,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" />
		@@ -351,6 +356,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
		@@ -120,6 +120,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;
		@@ -319,6 +320,7 @@ public class SettingsGateway {
		InteractAcrossProfilesDetails.class.getName(),
		MediaControlsSettings.class.getName(),
		NetworkProviderSettings.class.getName(),
		NetworkSelectSettings.class.getName(),
		AlarmsAndRemindersDetails.class.getName(),
		MediaManagementAppsDetails.class.getName(),
		AutoBrightnessSettings.class.getName()
		@@ -343,6 +345,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/NetworkSelectSettings.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.settings.network.telephony;
		import android.app.Activity;
		import android.app.settings.SettingsEnums;
		import android.content.Context;
		import android.content.Intent;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Message;
		@@ -101,7 +102,7 @@ public class NetworkSelectSettings extends DashboardFragment {
		@VisibleForTesting
		protected void onCreateInitialization() {
		mUseNewApi = enableNewAutoSelectNetworkUI(getContext());
		mSubId = getArguments().getInt(Settings.EXTRA_SUB_ID);
		mSubId = getSubId();

		mPreferenceCategory = getPreferenceCategory(PREF_KEY_NETWORK_OPERATORS);
		mStatusMessagePreference = new Preference(getContext());
		@@ -120,7 +121,7 @@ public class NetworkSelectSettings extends DashboardFragment {
		mMetricsFeatureProvider = getMetricsFeatureProvider(getContext());
		mIsAggregationEnabled = enableAggregation(getContext());
		Log.d(TAG, "init: mUseNewApi:" + mUseNewApi
		+ " ,mIsAggregationEnabled:" + mIsAggregationEnabled);
		+ " ,mIsAggregationEnabled:" + mIsAggregationEnabled + " ,mSubId:" + mSubId);
		}

		@Keep
		@@ -174,6 +175,18 @@ public class NetworkSelectSettings extends DashboardFragment {
		getPreferenceScreen().setEnabled(enable);
		}

		@Keep
		@VisibleForTesting
		protected int getSubId() {
		int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		Intent intent = getActivity().getIntent();
		if (intent != null) {
		subId = intent.getIntExtra(Settings.EXTRA_SUB_ID,
		SubscriptionManager.INVALID_SUBSCRIPTION_ID);
		}
		return subId;
		}

		@Override
		public void onViewCreated(View view, Bundle savedInstanceState) {
		super.onViewCreated(view, savedInstanceState);