Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94991188 authored by Lucas Lin's avatar Lucas Lin Committed by Android (Google) Code Review
Browse files

Merge "Modify SettingsLib for partial connectivity"

parents 2e7ec95c fc731abf

packages/SettingsLib/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,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>

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+3 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,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);

                }

packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java

+4 −0
Original line number Diff line number Diff line
@@ -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;
@@ -158,6 +159,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;