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

resolve merge conflicts of 0c7e4ed to master.

Browse Source 
Change-Id: I6c5625564f69769eb6f61d3df7531f032080d0d9
This commit is contained in:
Jeff Davidson
2014-12-09 15:11:44 -08:00
parent 2a321adc9b 0c7e4ed697
commit 06b65d1c7d
6 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/AccessPoint.java
View File

@@ -617,7 +617,7 @@ class AccessPoint extends Preference {
* For ephemeral connections (networkId is invalid), this returns false if the network is
* disconnected.
*/
private boolean isActive() {
boolean isActive() {
return mNetworkInfo != null &&
(networkId != WifiConfiguration.INVALID_NETWORK_ID ||
mNetworkInfo.getState() != State.DISCONNECTED);
@@ -639,7 +639,8 @@ class AccessPoint extends Preference {
StringBuilder summary = new StringBuilder();
if (isActive()) { // This is the active connection
summary.append(Summary.get(context, getState()));
summary.append(Summary.get(context, getState(),
networkId == WifiConfiguration.INVALID_NETWORK_ID));
} else if (mConfig != null
&& mConfig.hasNoInternetAccess()) {
summary.append(context.getString(R.string.wifi_no_internet));

11
src/com/android/settings/wifi/Summary.java
View File

@@ -22,7 +22,12 @@ import android.content.Context;
import android.net.NetworkInfo.DetailedState;
class Summary {
static String get(Context context, String ssid, DetailedState state) {
static String get(Context context, String ssid, DetailedState state, boolean isEphemeral) {
if (state == DetailedState.CONNECTED && isEphemeral && ssid == null) {
// Special case for connected + ephemeral networks.
return context.getString(R.string.connected_via_wfa);
}
String[] formats = context.getResources().getStringArray((ssid == null)
? R.array.wifi_status : R.array.wifi_status_with_ssid);
int index = state.ordinal();
@@ -33,7 +38,7 @@ class Summary {
return String.format(formats[index], ssid);
}
static String get(Context context, DetailedState state) {
return get(context, null, state);
static String get(Context context, DetailedState state, boolean isEphemeral) {
return get(context, null, state, isEphemeral);
}
}

8
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -241,7 +241,8 @@ public class WifiConfigController implements TextWatcher,
}
}
if (mAccessPoint.networkId == INVALID_NETWORK_ID || mEdit) {
if ((mAccessPoint.networkId == INVALID_NETWORK_ID && !mAccessPoint.isActive())
|| mEdit) {
showSecurityFields();
showIpConfigFields();
showProxyFields();
@@ -265,7 +266,8 @@ public class WifiConfigController implements TextWatcher,
} else {
if (state != null) {
addRow(group, R.string.wifi_status, Summary.get(mConfigUi.getContext(),
state));
state, mAccessPoint.networkId ==
WifiConfiguration.INVALID_NETWORK_ID));
}
if (signalLevel != null) {
@@ -299,7 +301,7 @@ public class WifiConfigController implements TextWatcher,
addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));
mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);
}
if (mAccessPoint.networkId != INVALID_NETWORK_ID) {
if (mAccessPoint.networkId != INVALID_NETWORK_ID || mAccessPoint.isActive()) {
mConfigUi.setForgetButton(res.getString(R.string.wifi_forget));
}
}

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

@@ -517,24 +517,20 @@ public class WifiSettings extends RestrictedSettingsFragment
mSelectedAccessPoint = (AccessPoint) preference;
menu.setHeaderTitle(mSelectedAccessPoint.ssid);
if (mSelectedAccessPoint.getLevel() != -1) {
int connectStringRes = 0;
if (mSelectedAccessPoint.getState() == null) {
connectStringRes = R.string.wifi_menu_connect;
} else if (mSelectedAccessPoint.networkId == INVALID_NETWORK_ID &&
mSelectedAccessPoint.getNetworkInfo().getState()
!= State.DISCONNECTED) {
// State is non-null (and not disconnected) but this network has no
// configuration, which means it is ephemeral. Allow the user to save the
// configuration permanently (but still issue this as a CONNECT command).
connectStringRes = R.string.wifi_menu_remember;
}
if (connectStringRes != 0) {
menu.add(Menu.NONE, MENU_ID_CONNECT, 0, connectStringRes);
menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
}
}
if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID ||
(mSelectedAccessPoint.getNetworkInfo() != null &&
mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED)) {
// Allow forgetting a network if either the network is saved or ephemerally
// connected. (In the latter case, "forget" blacklists the network so it won't
// be used again, ephemerally).
menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
}
if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
if (mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {
@@ -565,7 +561,7 @@ public class WifiSettings extends RestrictedSettingsFragment
return true;
}
case MENU_ID_FORGET: {
mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
forget();
return true;
}
case MENU_ID_MODIFY: {
@@ -584,9 +580,10 @@ public class WifiSettings extends RestrictedSettingsFragment
public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
if (preference instanceof AccessPoint) {
mSelectedAccessPoint = (AccessPoint) preference;
/** Bypass dialog for unsecured, unsaved networks */
/** Bypass dialog for unsecured, unsaved, and inactive networks */
if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
mSelectedAccessPoint.networkId == INVALID_NETWORK_ID &&
!mSelectedAccessPoint.isActive()) {
mSelectedAccessPoint.generateOpenNetworkConfig();
if (!savedNetworksExist) {
savedNetworksExist = true;
@@ -920,12 +917,19 @@ public class WifiSettings extends RestrictedSettingsFragment
/* package */ void forget() {
if (mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
// Should not happen, but a monkey seems to trigger it
Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
return;
if (mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
// Network is active but has no network ID - must be ephemeral.
mWifiManager.disableEphemeralNetwork(
AccessPoint.convertToQuotedString(mSelectedAccessPoint.ssid));
} else {
// Should not happen, but a monkey seems to trigger it
Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
return;
}
} else {
mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
}
mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
if (mWifiManager.isWifiEnabled()) {
mScanner.resume();

2
src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
View File

@@ -285,7 +285,7 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
default: // DISCONNECTED, FAILED
if (mScreenState != SCREEN_STATE_CONNECTED &&
mWifiSettings.getAccessPointsCount() > 0) {
showDisconnectedState(Summary.get(this, state));
showDisconnectedState(Summary.get(this, state, false /* isEphemeral */));
}
break;
}

11
src/com/android/settings/wifi/WifiStatusTest.java
View File

@@ -17,12 +17,16 @@
package com.android.settings.wifi;
import com.android.settings.R;
import android.net.wifi.ScanResult;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
import java.util.List;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -30,6 +34,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.net.NetworkInfo;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Bundle;
@@ -40,6 +45,7 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
import java.io.IOException;
import java.net.UnknownHostException;
@@ -294,8 +300,9 @@ public class WifiStatusTest extends Activity {
private void handleNetworkStateChanged(NetworkInfo networkInfo) {
if (mWifiManager.isWifiEnabled()) {
String summary = Summary.get(this, mWifiManager.getConnectionInfo().getSSID(),
networkInfo.getDetailedState());
WifiInfo info = mWifiManager.getConnectionInfo();
String summary = Summary.get(this, info.getSSID(), networkInfo.getDetailedState(),
info.getNetworkId() == WifiConfiguration.INVALID_NETWORK_ID);
mNetworkState.setText(summary);
}
}