PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove WirelessSettings and related code not used in new IA.

Browse Source 
- remove WirelessSettingsActivity and update other references to it.
- move the intent filter android.settings.WIRELESS_SETTINGS and
  android.settings.AIRPLANE_MODE_SETTINGS into Network dashboard
- move intent filter android.settings.NFC_SETTINGS into Connected
  devices dashboard.

Change-Id: I84f75ac45d0712eac9c40aa6c8f052bc060ed03a
Fix: 32342061
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2017-03-03 11:28:05 -08:00
parent 430c8d37d0
commit 26208220cf
11 changed files with 51 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
AndroidManifest.xml
View File

@@ -176,14 +176,40 @@
<!-- Wireless Controls --> <!-- Wireless Controls -->
<activity android:name="Settings$WirelessSettingsActivity" <activity android:name=".Settings$NetworkDashboardActivity"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:label="@string/wireless_networks_settings_title" android:label="@string/network_dashboard_title"
android:icon="@drawable/ic_settings_more" android:icon="@drawable/ic_dashboard_network"
android:parentActivityName="Settings"> android:parentActivityName="Settings">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.WIRELESS_SETTINGS" /> <action android:name="android.settings.WIRELESS_SETTINGS" />
<action android:name="android.settings.AIRPLANE_MODE_SETTINGS" /> <action android:name="android.settings.AIRPLANE_MODE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
<intent-filter android:priority="10">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.network.NetworkDashboardFragment"/>
<meta-data android:name="com.android.settings.summary"
android:value="@string/network_dashboard_summary"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
<activity android:name=".Settings$ConnectedDeviceDashboardActivity"
android:taskAffinity="com.android.settings"
android:label="@string/connected_devices_dashboard_title"
android:icon="@drawable/ic_devices_other"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.NFC_SETTINGS" /> <action android:name="android.settings.NFC_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
@@ -192,16 +218,15 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" /> <category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter> </intent-filter>
<intent-filter android:priority="-1"> <intent-filter android:priority="10">
<action android:name="com.android.settings.action.SETTINGS"/> <action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.wireless" />
<meta-data android:name="com.android.settings.title"
android:resource="@string/radio_controls_title" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.WirelessSettings" /> android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
<!-- Note that this doesn't really show any Wireless settings. --> <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.summary"
android:value="@string/connected_devices_dashboard_summary"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" /> android:value="true" />
</activity> </activity>
@@ -384,7 +409,7 @@
android:launchMode="singleTask" android:launchMode="singleTask"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:parentActivityName="Settings$WirelessSettingsActivity" android:parentActivityName="Settings$NetworkDashboardActivity"
android:process="com.android.phone"> android:process="com.android.phone">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.APN_SETTINGS" /> <action android:name="android.settings.APN_SETTINGS" />
@@ -2091,7 +2116,7 @@
<activity android:name="Settings$AndroidBeamSettingsActivity" <activity android:name="Settings$AndroidBeamSettingsActivity"
android:label="@string/android_beam_settings_title" android:label="@string/android_beam_settings_title"
android:taskAffinity="com.android.settings" android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WirelessSettingsActivity"> android:parentActivityName="Settings$ConnectedDeviceDashboardActivity">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.NFCSHARING_SETTINGS" /> <action android:name="android.settings.NFCSHARING_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -2962,35 +2987,6 @@
<!-- Information architecture host activities --> <!-- Information architecture host activities -->
<!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity --> <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
<activity android:name=".Settings$NetworkDashboardActivity"
android:taskAffinity=""
android:label="@string/network_dashboard_title"
android:icon="@drawable/ic_dashboard_network">
<intent-filter android:priority="10">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.network.NetworkDashboardFragment"/>
<meta-data android:name="com.android.settings.summary"
android:value="@string/network_dashboard_summary"/>
</activity>
<activity android:name=".Settings$ConnectedDeviceDashboardActivity"
android:label="@string/connected_devices_dashboard_title"
android:icon="@drawable/ic_devices_other">
<intent-filter android:priority="10">
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.summary"
android:value="@string/connected_devices_dashboard_summary"/>
</activity>
<activity android:name=".Settings$AppAndNotificationDashboardActivity" <activity android:name=".Settings$AppAndNotificationDashboardActivity"
android:label="@string/app_and_notification_dashboard_title" android:label="@string/app_and_notification_dashboard_title"
android:icon="@drawable/ic_dashboard_apps"> android:icon="@drawable/ic_dashboard_apps">

25
res/drawable/ic_settings_more.xml
View File

@@ -1,25 +0,0 @@
<!--
Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="18.0"
android:viewportHeight="18.0"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
</vector>

101
res/xml/wireless_settings.xml
View File

@@ -1,101 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/radio_controls_title">
<SwitchPreference
android:key="toggle_airplane"
android:title="@string/airplane_mode"
android:disableDependentsState="true" />
<SwitchPreference
android:key="toggle_nfc"
android:title="@string/nfc_quick_toggle_title"
android:summary="@string/nfc_quick_toggle_summary" />
<PreferenceScreen
android:key="wifi_calling_settings"
android:title="@string/wifi_calling_settings_title"
settings:keywords="@string/keywords_wifi_calling"
android:fragment="com.android.settings.WifiCallingSettings" />
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.nfc.AndroidBeam"
android:key="android_beam_settings"
android:title="@string/android_beam_settings_title" />
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.TetherSettings"
android:key="tether_settings"
android:title="@string/tether_settings_title_all"
settings:userRestriction="no_config_tethering"
settings:useAdminDisabledSummary="true" />
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.vpn2.VpnSettings"
android:key="vpn_settings"
android:title="@string/vpn_settings_title"
settings:userRestriction="no_config_vpn"
settings:useAdminDisabledSummary="true" />
<com.android.settingslib.RestrictedPreference
android:key="mobile_network_settings"
android:title="@string/network_settings_title"
settings:keywords="@string/keywords_more_mobile_networks"
settings:userRestriction="no_config_mobile_networks"
settings:useAdminDisabledSummary="true"
android:dependency="toggle_airplane">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.phone"
android:targetClass="com.android.phone.MobileNetworkSettings" />
</com.android.settingslib.RestrictedPreference>
<com.android.settingslib.RestrictedPreference
android:key="manage_mobile_plan"
android:title="@string/manage_mobile_plan_title"
android:persistent="false"
settings:userRestriction="no_config_mobile_networks"
settings:useAdminDisabledSummary="true" />
<com.android.settingslib.RestrictedPreference
android:key="wimax_settings"
android:title="@string/wimax_settings"
settings:userRestriction="no_config_mobile_networks"
settings:useAdminDisabledSummary="true">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings.wimax"
android:targetClass="com.android.settings.wimax.WimaxSettings" />
</com.android.settingslib.RestrictedPreference>
<PreferenceScreen
android:fragment="com.android.settings.ProxySelector"
android:key="proxy_settings"
android:title="@string/proxy_settings_title" />
<!-- Network reset -->
<com.android.settingslib.RestrictedPreference
android:key="network_reset"
android:title="@string/reset_network_title"
settings:keywords="@string/keywords_network_reset"
settings:userRestriction="no_network_reset"
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.ResetNetwork" />
</PreferenceScreen>

1
src/com/android/settings/Settings.java
View File

@@ -29,7 +29,6 @@ public class Settings extends SettingsActivity {
* Settings subclasses for launching independently. * Settings subclasses for launching independently.
*/ */
public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ } public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ }
public static class WirelessSettingsActivity extends SettingsActivity { /* empty */ }
public static class SimSettingsActivity extends SettingsActivity { /* empty */ } public static class SimSettingsActivity extends SettingsActivity { /* empty */ }
public static class TetherSettingsActivity extends SettingsActivity { /* empty */ } public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }
public static class VpnSettingsActivity extends SettingsActivity { /* empty */ } public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }

6
src/com/android/settings/SettingsActivity.java
View File

@@ -920,7 +920,11 @@ public class SettingsActivity extends SettingsDrawerActivity
&& !Utils.isMonkeyRunning(), isAdmin); && !Utils.isMonkeyRunning(), isAdmin);
setTileEnabled(new ComponentName(packageName, setTileEnabled(new ComponentName(packageName,
Settings.WirelessSettingsActivity.class.getName()), Settings.NetworkDashboardActivity.class.getName()),
!UserManager.isDeviceInDemoMode(this), isAdmin);
setTileEnabled(new ComponentName(packageName,
Settings.ConnectedDeviceDashboardActivity.class.getName()),
!UserManager.isDeviceInDemoMode(this), isAdmin); !UserManager.isDeviceInDemoMode(this), isAdmin);
setTileEnabled(new ComponentName(packageName, setTileEnabled(new ComponentName(packageName,

219
src/com/android/settings/WirelessSettings.java
View File

@@ -1,219 +0,0 @@
/*
* Copyright (C) 2009 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.network.AirplaneModePreferenceController;
import com.android.settings.network.MobileNetworkPreferenceController;
import com.android.settings.network.MobilePlanPreferenceController;
import com.android.settings.network.ProxyPreferenceController;
import com.android.settings.network.TetherPreferenceController;
import com.android.settings.network.VpnPreferenceController;
import com.android.settings.network.WifiCallingPreferenceController;
import com.android.settings.nfc.NfcPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.RestrictedLockUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static com.android.settings.network.MobilePlanPreferenceController
.MANAGE_MOBILE_PLAN_DIALOG_ID;
public class WirelessSettings extends SettingsPreferenceFragment implements Indexable,
MobilePlanPreferenceController.MobilePlanPreferenceHost {
private static final String TAG = "WirelessSettings";
private static final String KEY_WIMAX_SETTINGS = "wimax_settings";
private UserManager mUm;
private AirplaneModePreferenceController mAirplaneModePreferenceController;
private TetherPreferenceController mTetherPreferenceController;
private MobileNetworkPreferenceController mMobileNetworkPreferenceController;
private VpnPreferenceController mVpnPreferenceController;
private WifiCallingPreferenceController mWifiCallingPreferenceController;
private ProxyPreferenceController mProxyPreferenceController;
private MobilePlanPreferenceController mMobilePlanPreferenceController;
private NfcPreferenceController mNfcPreferenceController;
/**
* Invoked on each preference click in this hierarchy, overrides
* PreferenceFragment's implementation. Used to make sure we track the
* preference click events.
*/
@Override
public boolean onPreferenceTreeClick(Preference preference) {
log("onPreferenceTreeClick: preference=" + preference);
if (mAirplaneModePreferenceController.handlePreferenceTreeClick(preference)) {
return true;
}
if (mMobilePlanPreferenceController.handlePreferenceTreeClick(preference)) {
return true;
}
// Let the intents be launched by the Preference manager
return super.onPreferenceTreeClick(preference);
}
@Override
public Dialog onCreateDialog(int dialogId) {
log("onCreateDialog: dialogId=" + dialogId);
switch (dialogId) {
case MANAGE_MOBILE_PLAN_DIALOG_ID:
return new AlertDialog.Builder(getActivity())
.setMessage(mMobilePlanPreferenceController.getMobilePlanDialogMessage())
.setCancelable(false)
.setPositiveButton(com.android.internal.R.string.ok,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
log("MANAGE_MOBILE_PLAN_DIALOG.onClickListener id=" + id);
mMobilePlanPreferenceController
.setMobilePlanDialogMessage(null);
}
})
.create();
}
return super.onCreateDialog(dialogId);
}
@Override
public int getDialogMetricsCategory(int dialogId) {
if (MANAGE_MOBILE_PLAN_DIALOG_ID == dialogId) {
return MetricsEvent.DIALOG_MANAGE_MOBILE_PLAN;
}
return 0;
}
private void log(String s) {
Log.d(TAG, s);
}
@Override
public int getMetricsCategory() {
return MetricsEvent.WIRELESS;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mUm = (UserManager) getSystemService(Context.USER_SERVICE);
addPreferencesFromResource(R.xml.wireless_settings);
final boolean isAdmin = mUm.isAdminUser();
final Activity activity = getActivity();
final PreferenceScreen screen = getPreferenceScreen();
mAirplaneModePreferenceController = new AirplaneModePreferenceController(activity, this);
mTetherPreferenceController = new TetherPreferenceController(activity);
mMobileNetworkPreferenceController = new MobileNetworkPreferenceController(activity);
mVpnPreferenceController = new VpnPreferenceController(activity);
mWifiCallingPreferenceController = new WifiCallingPreferenceController(activity);
mProxyPreferenceController = new ProxyPreferenceController(activity);
mMobilePlanPreferenceController = new MobilePlanPreferenceController(activity, this);
mNfcPreferenceController = new NfcPreferenceController(activity);
mMobilePlanPreferenceController.onCreate(savedInstanceState);
mAirplaneModePreferenceController.displayPreference(screen);
mTetherPreferenceController.displayPreference(screen);
mMobileNetworkPreferenceController.displayPreference(screen);
mVpnPreferenceController.displayPreference(screen);
mWifiCallingPreferenceController.displayPreference(screen);
mProxyPreferenceController.displayPreference(screen);
mMobilePlanPreferenceController.displayPreference(screen);
mNfcPreferenceController.displayPreference(screen);
String toggleable = Settings.Global.getString(activity.getContentResolver(),
Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
//enable/disable wimax depending on the value in config.xml
final boolean isWimaxEnabled = isAdmin && this.getResources().getBoolean(
com.android.internal.R.bool.config_wimaxEnabled);
if (!isWimaxEnabled || RestrictedLockUtils.hasBaseUserRestriction(activity,
UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, UserHandle.myUserId())) {
PreferenceScreen root = getPreferenceScreen();
Preference ps = findPreference(KEY_WIMAX_SETTINGS);
if (ps != null) root.removePreference(ps);
} else {
if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIMAX)
&& isWimaxEnabled) {
Preference ps = findPreference(KEY_WIMAX_SETTINGS);
ps.setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
}
}
}
@Override
public void onResume() {
super.onResume();
mAirplaneModePreferenceController.onResume();
mNfcPreferenceController.onResume();
}
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
mMobilePlanPreferenceController.onSaveInstanceState(outState);
}
@Override
public void onPause() {
super.onPause();
mAirplaneModePreferenceController.onPause();
mNfcPreferenceController.onPause();
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
mAirplaneModePreferenceController.onActivityResult(requestCode, resultCode, data);
super.onActivityResult(requestCode, resultCode, data);
}
@Override
public void showMobilePlanMessageDialog() {
showDialog(MANAGE_MOBILE_PLAN_DIALOG_ID);
}
@Override
protected int getHelpResource() {
return R.string.help_url_more_networks;
}
}

3
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -39,7 +39,6 @@ import com.android.settings.TrustedCredentialsSettings;
import com.android.settings.UserDictionarySettings; import com.android.settings.UserDictionarySettings;
import com.android.settings.WallpaperTypeSettings; import com.android.settings.WallpaperTypeSettings;
import com.android.settings.WifiCallingSettings; import com.android.settings.WifiCallingSettings;
import com.android.settings.WirelessSettings;
import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilitySettings;
import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard; import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
import com.android.settings.accessibility.CaptionPropertiesFragment; import com.android.settings.accessibility.CaptionPropertiesFragment;
@@ -133,7 +132,6 @@ public class SettingsGateway {
* security exception if the fragment it needs to display is not in this list. * security exception if the fragment it needs to display is not in this list.
*/ */
public static final String[] ENTRY_FRAGMENTS = { public static final String[] ENTRY_FRAGMENTS = {
WirelessSettings.class.getName(),
WifiSettings.class.getName(), WifiSettings.class.getName(),
ConfigureWifiSettings.class.getName(), ConfigureWifiSettings.class.getName(),
SavedAccessPointsWifiSettings.class.getName(), SavedAccessPointsWifiSettings.class.getName(),
@@ -249,7 +247,6 @@ public class SettingsGateway {
Settings.WifiSettingsActivity.class.getName(), Settings.WifiSettingsActivity.class.getName(),
Settings.BluetoothSettingsActivity.class.getName(), Settings.BluetoothSettingsActivity.class.getName(),
Settings.SimSettingsActivity.class.getName(), Settings.SimSettingsActivity.class.getName(),
Settings.WirelessSettingsActivity.class.getName(),
//device_section //device_section
Settings.SoundSettingsActivity.class.getName(), Settings.SoundSettingsActivity.class.getName(),
Settings.DisplaySettingsActivity.class.getName(), Settings.DisplaySettingsActivity.class.getName(),

2
src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
View File

@@ -73,7 +73,7 @@ public class AirplaneModeCondition extends Condition {
@Override @Override
public void onPrimaryClick() { public void onPrimaryClick() {
mManager.getContext().startActivity(new Intent(mManager.getContext(), mManager.getContext().startActivity(new Intent(mManager.getContext(),
Settings.WirelessSettingsActivity.class)); Settings.NetworkDashboardActivity.class));
} }
@Override @Override

4
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -54,13 +54,13 @@ import com.android.settings.DisplaySettings;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.WirelessSettings;
import com.android.settings.applications.AppHeaderController; import com.android.settings.applications.AppHeaderController;
import com.android.settings.applications.InstalledAppDetails; import com.android.settings.applications.InstalledAppDetails;
import com.android.settings.applications.LayoutPreference; import com.android.settings.applications.LayoutPreference;
import com.android.settings.bluetooth.BluetoothSettings; import com.android.settings.bluetooth.BluetoothSettings;
import com.android.settings.core.PreferenceController; import com.android.settings.core.PreferenceController;
import com.android.settings.location.LocationSettings; import com.android.settings.location.LocationSettings;
import com.android.settings.network.NetworkDashboardFragment;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.wifi.WifiSettings; import com.android.settings.wifi.WifiSettings;
@@ -571,7 +571,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
R.string.bluetooth_settings, null, null, 0); R.string.bluetooth_settings, null, null, 0);
break; break;
case ACTION_WIRELESS_SETTINGS: case ACTION_WIRELESS_SETTINGS:
sa.startPreferencePanel(this, WirelessSettings.class.getName(), null, sa.startPreferencePanel(this, NetworkDashboardFragment.class.getName(), null,
R.string.radio_controls_title, null, null, 0); R.string.radio_controls_title, null, null, 0);
break; break;
case ACTION_APP_DETAILS: case ACTION_APP_DETAILS:

6
src/com/android/settings/search/Ranking.java
View File

@@ -26,7 +26,6 @@ import com.android.settings.PrivacySettings;
import com.android.settings.ScreenPinningSettings; import com.android.settings.ScreenPinningSettings;
import com.android.settings.SecuritySettings; import com.android.settings.SecuritySettings;
import com.android.settings.WallpaperTypeSettings; import com.android.settings.WallpaperTypeSettings;
import com.android.settings.WirelessSettings;
import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilitySettings;
import com.android.settings.accounts.UserAndAccountDashboardFragment; import com.android.settings.accounts.UserAndAccountDashboardFragment;
import com.android.settings.applications.AdvancedAppSettings; import com.android.settings.applications.AdvancedAppSettings;
@@ -50,6 +49,7 @@ import com.android.settings.gestures.SwipeToNotificationSettings;
import com.android.settings.language.LanguageAndInputSettings; import com.android.settings.language.LanguageAndInputSettings;
import com.android.settings.location.LocationSettings; import com.android.settings.location.LocationSettings;
import com.android.settings.location.ScanningSettings; import com.android.settings.location.ScanningSettings;
import com.android.settings.network.NetworkDashboardFragment;
import com.android.settings.notification.ConfigureNotificationSettings; import com.android.settings.notification.ConfigureNotificationSettings;
import com.android.settings.notification.SoundSettings; import com.android.settings.notification.SoundSettings;
import com.android.settings.notification.ZenModeAutomationSettings; import com.android.settings.notification.ZenModeAutomationSettings;
@@ -122,8 +122,8 @@ public final class Ranking {
sRankMap.put(DataUsageSummary.class.getName(), RANK_DATA_USAGE); sRankMap.put(DataUsageSummary.class.getName(), RANK_DATA_USAGE);
sRankMap.put(DataUsageMeteredSettings.class.getName(), RANK_DATA_USAGE); sRankMap.put(DataUsageMeteredSettings.class.getName(), RANK_DATA_USAGE);
// Other wireless settinfs // Other wireless settings
sRankMap.put(WirelessSettings.class.getName(), RANK_WIRELESS); sRankMap.put(NetworkDashboardFragment.class.getName(), RANK_WIRELESS);
// Display // Display
sRankMap.put(DisplaySettings.class.getName(), RANK_DISPLAY); sRankMap.put(DisplaySettings.class.getName(), RANK_DISPLAY);

2
src/com/android/settings/search/SearchIndexableResources.java
View File

@@ -31,7 +31,6 @@ import com.android.settings.R;
import com.android.settings.ScreenPinningSettings; import com.android.settings.ScreenPinningSettings;
import com.android.settings.SecuritySettings; import com.android.settings.SecuritySettings;
import com.android.settings.WallpaperTypeSettings; import com.android.settings.WallpaperTypeSettings;
import com.android.settings.WirelessSettings;
import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilitySettings;
import com.android.settings.accounts.UserAndAccountDashboardFragment; import com.android.settings.accounts.UserAndAccountDashboardFragment;
import com.android.settings.applications.AdvancedAppSettings; import com.android.settings.applications.AdvancedAppSettings;
@@ -109,7 +108,6 @@ public final class SearchIndexableResources {
addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd); addIndex(SimSettings.class, NO_DATA_RES_ID, R.drawable.ic_sim_sd);
addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage); addIndex(DataUsageSummary.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage); addIndex(DataUsageMeteredSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_data_usage);
addIndex(WirelessSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_more);
addIndex(ScreenZoomSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display); addIndex(ScreenZoomSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
addIndex(DisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display); addIndex(DisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);
addIndex(WallpaperTypeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display); addIndex(WallpaperTypeSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display);