Merge "Expand Wifi Picker Menu by default."
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dfd51b8..9c2c964 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1612,8 +1612,6 @@
<string name="wifi_starting">Turning Wi\u2011Fi on\u2026</string>
<!-- Summary text when turning Wi-Fi or bluetooth off -->
<string name="wifi_stopping">Turning off Wi\u2011Fi\u2026</string>
- <!-- Title of Button to show all Wi-Fi networks in the picker. [CHAR LIMIT=30] -->
- <string name="wifi_see_all_networks_button_title">See all networks</string>
<!-- Summary text when Wi-Fi or bluetooth has error -->
<string name="wifi_error">Error</string>
<!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 93f06fa..e9204f9 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -139,10 +139,6 @@
// should Next button only be enabled when we have a connection?
private boolean mEnableNextOnConnection;
- // should see all networks instead of collapsing networks and showing mSeeAllNetworksPreference.
- private boolean mSeeAllNetworks;
- private static final int NETWORKS_TO_INITIALLY_SHOW = 5;
-
// Save the dialog details
private int mDialogMode;
private AccessPoint mDlgAccessPoint;
@@ -160,7 +156,6 @@
private PreferenceCategory mAccessPointsPreferenceCategory;
private PreferenceCategory mAdditionalSettingsPreferenceCategory;
private Preference mAddPreference;
- private Preference mSeeAllNetworksPreference;
private Preference mConfigureWifiSettingsPreference;
private Preference mSavedNetworksPreference;
private LinkablePreference mStatusMessagePreference;
@@ -210,10 +205,6 @@
mAddPreference = new Preference(prefContext);
mAddPreference.setIcon(R.drawable.ic_menu_add_inset);
mAddPreference.setTitle(R.string.wifi_add_network);
- mSeeAllNetworksPreference = new Preference(prefContext);
- mSeeAllNetworksPreference.setIcon(R.drawable.ic_arrow_down_24dp);
- mSeeAllNetworksPreference.setTitle(R.string.wifi_see_all_networks_button_title);
- mSeeAllNetworks = false;
mStatusMessagePreference = new LinkablePreference(prefContext);
mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());
@@ -525,9 +516,6 @@
}
} else if (preference == mAddPreference) {
onAddNetworkPressed();
- } else if (preference == mSeeAllNetworksPreference) {
- mSeeAllNetworks = true;
- onAccessPointsChanged();
} else {
return super.onPreferenceTreeClick(preference);
}
@@ -671,12 +659,8 @@
int index =
configureConnectedAccessPointPreferenceCategory(accessPoints) ? 1 : 0;
- boolean fewerNetworksThanLimit =
- accessPoints.size() <= index + NETWORKS_TO_INITIALLY_SHOW;
- int numAccessPointsToShow = mSeeAllNetworks || fewerNetworksThanLimit
- ? accessPoints.size() : index + NETWORKS_TO_INITIALLY_SHOW;
-
- for (; index < numAccessPointsToShow; index++) {
+ int numAccessPoints = accessPoints.size();
+ for (; index < numAccessPoints; index++) {
AccessPoint accessPoint = accessPoints.get(index);
// Ignore access points that are out of range.
if (accessPoint.isReachable()) {
@@ -707,15 +691,8 @@
}
}
removeCachedPrefs(mAccessPointsPreferenceCategory);
- if (mSeeAllNetworks || fewerNetworksThanLimit) {
- mAccessPointsPreferenceCategory.removePreference(mSeeAllNetworksPreference);
- mAddPreference.setOrder(index);
- mAccessPointsPreferenceCategory.addPreference(mAddPreference);
- } else {
- mAccessPointsPreferenceCategory.removePreference(mAddPreference);
- mSeeAllNetworksPreference.setOrder(index);
- mAccessPointsPreferenceCategory.addPreference(mSeeAllNetworksPreference);
- }
+ mAddPreference.setOrder(index);
+ mAccessPointsPreferenceCategory.addPreference(mAddPreference);
setConfigureWifiSettingsVisibility();
if (!hasAvailableAccessPoints) {