From dce1c724f1cea5128d485342ea8af72c1f770aa3 Mon Sep 17 00:00:00 2001 From: Sanket Padawe Date: Mon, 13 Apr 2015 17:57:38 -0700 Subject: Remove "Show apps" and add summary to saved networks from Wifi Settings. Bug: 20148271 Change-Id: Ie042ac83a7253ff86f3eda77fb1e8a4c0e1a13d5 --- src/com/android/settings/wifi/WifiSettings.java | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'src/com/android/settings/wifi/WifiSettings.java') diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index cb6be53..f46edac 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -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); -- cgit v1.1