Merge "Device do network scan after user rotates NetworkSelection page" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
c350919fa4
@@ -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;
|
||||
@@ -320,6 +321,7 @@ public class SettingsGateway {
|
||||
InteractAcrossProfilesDetails.class.getName(),
|
||||
MediaControlsSettings.class.getName(),
|
||||
NetworkProviderSettings.class.getName(),
|
||||
NetworkSelectSettings.class.getName(),
|
||||
AlarmsAndRemindersDetails.class.getName(),
|
||||
MediaManagementAppsDetails.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(),
|
||||
|
Reference in New Issue
Block a user