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

Final platform settings UX for ephemeral networks.

Browse Source 
Show "Connected via Wi-Fi assistant" instead of just "Connected" when
a Wi-Fi connection is ephemeral. Otherwise, treat ephemeral
connections just like saved ones - show (read-only) connection stats
when you click the network, and offer the ability to "forget" the
network, which prevents further ephemeral connections.

Bug: 18525241
Change-Id: I0d2146ab47b82d32c50b2ef883f176a6b6066713
This commit is contained in:
Jeff Davidson
2014-11-26 15:29:36 -08:00
parent 45893e65b6
commit 5ead6b92fd
6 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
}
}