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

Commit a4c97ffc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I6c0c8730,Icbae30d2 

* changes:
  Fix Wifi Signal strength in the picker.
  Create a Tron event for opening the network details page.
parents c998b7f7 73938992

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

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.drawable.Drawable; 
import android.graphics.drawable.StateListDrawable;

import android.net.NetworkBadging;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiManager;

import android.os.Looper;

import android.os.UserHandle;

import android.support.v7.preference.Preference;
@@ -222,7 +223,7 @@ public class AccessPointPreference extends Preference { 
        }



        final Context context = getContext();

        int level = mAccessPoint.getLevel();

        int level = WifiManager.calculateSignalLevel(mAccessPoint.getRssi(), 5 /* levels */);

        int wifiBadge = mAccessPoint.getBadge();

        if (level != mLevel || wifiBadge != mWifiBadge) {

            mLevel = level;

proto/src/metrics_constants.proto

+5 −0
Original line number Diff line number Diff line
@@ -3472,6 +3472,11 @@ message MetricsEvent { 
    // FIELD: Whether developer mode has already been enabled when clicking build number preference

    FIELD_SETTINGS_BUILD_NUMBER_DEVELOPER_MODE_ENABLED = 848;



    // OPEN: Settings > Wi-Fi > Network Details (click on Access Point)

    // CATEGORY: SETTINGS

    // OS: O

    WIFI_NETWORK_DETAILS = 849;



    // ---- End O Constants, all O constants go above this line ----



    // Add new aosp constants above this line.