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

Remove "Show apps" and add summary to saved networks from Wifi Settings.

Browse Source 
Bug: 20148271
Change-Id: Ie042ac83a7253ff86f3eda77fb1e8a4c0e1a13d5
This commit is contained in:
Sanket Padawe
2015-04-13 17:57:38 -07:00
parent 2132cedb94
commit dce1c724f1
4 changed files with 29 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -93,7 +93,6 @@ public class WifiSettings extends RestrictedSettingsFragment
private static final int MENU_ID_FORGET = Menu.FIRST + 7;
private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9;
private static final int MENU_ID_APPS = Menu.FIRST + 10;
public static final int WIFI_DIALOG_ID = 1;
/* package */ static final int WPS_PBC_DIALOG_ID = 2;
@@ -120,9 +119,6 @@ public class WifiSettings extends RestrictedSettingsFragment
private TextView mEmptyView;
private boolean showAppIcons = false;
private MenuItem showAppMenuItem = null;
// this boolean extra specifies whether to disable the Next button when not connected. Used by
// account creation outside of setup wizard.
private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
@@ -324,8 +320,6 @@ public class WifiSettings extends RestrictedSettingsFragment
.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
showAppMenuItem = menu.add(Menu.NONE, MENU_ID_APPS, 0, R.string.wifi_menu_apps);
showAppMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
ta.recycle();
}
@@ -406,16 +400,6 @@ public class WifiSettings extends RestrictedSettingsFragment
null);
}
return true;
case MENU_ID_APPS:
showAppIcons = !showAppIcons;
if (showAppIcons) {
showAppMenuItem.setTitle(R.string.wifi_menu_apps_strength);
} else {
showAppMenuItem.setTitle(R.string.wifi_menu_apps);
}
onAccessPointsChanged();
return true;
}
return super.onOptionsItemSelected(item);
}
@@ -584,9 +568,6 @@ public class WifiSettings extends RestrictedSettingsFragment
if (accessPoint.getLevel() != -1) {
AccessPointPreference preference = new AccessPointPreference(accessPoint,
getActivity());
if (showAppIcons) {
preference.showAppIcon();
}
getPreferenceScreen().addPreference(preference);
accessPoint.setListener(this);