Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modify SettingsLib for partial connectivity" am: 64bb980f45

Browse Source 
am: 1eb23ba267

Change-Id: I8b6c1ef312c0b79f41ebbfe17eaccfa535ac0597
This commit is contained in:
Lucas Lin
2019-03-21 18:42:46 -07:00
committed by android-build-merger
parent 228d75b448 1eb23ba267
commit 04bd7a8bad
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/res/values/strings.xml
View File

@@ -97,6 +97,9 @@
<!-- Summary for Connected wifi network without internet -->
<string name="wifi_connected_no_internet">Connected, no internet</string>
<!-- Summary for connected wifi network with partial internet connectivity [CHAR LIMIT=50] -->
<string name="wifi_limited_connection">Limited connection</string>
<!-- Wi-Fi status indicating that the current network is connected, but has no internet access. -->
<string name="wifi_status_no_internet">No internet</string>

6
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -48,7 +48,6 @@ import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.UserHandle;
import androidx.annotation.NonNull;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
@@ -56,6 +55,8 @@ import android.text.style.TtsSpan;
import android.util.ArraySet;
import android.util.Log;
import androidx.annotation.NonNull;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settingslib.R;
import com.android.settingslib.utils.ThreadUtils;
@@ -1243,6 +1244,9 @@ public class AccessPoint implements Comparable<AccessPoint> {
int id = context.getResources()
.getIdentifier("network_available_sign_in", "string", "android");
return context.getString(id);
} else if (nc.hasCapability(
NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY)) {
return context.getString(R.string.wifi_limited_connection);
} else if (!nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
return context.getString(R.string.wifi_connected_no_internet);
}

4
packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
View File

@@ -11,6 +11,7 @@
package com.android.settingslib.wifi;
import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;
import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;
import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
import android.content.Context;
@@ -151,6 +152,9 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback {
if (networkCapabilities.hasCapability(NET_CAPABILITY_CAPTIVE_PORTAL)) {
statusLabel = mContext.getString(R.string.wifi_status_sign_in_required);
return;
} else if (networkCapabilities.hasCapability(NET_CAPABILITY_PARTIAL_CONNECTIVITY)) {
statusLabel = mContext.getString(R.string.wifi_limited_connection);
return;
} else if (!networkCapabilities.hasCapability(NET_CAPABILITY_VALIDATED)) {
statusLabel = mContext.getString(R.string.wifi_status_no_internet);
return;