From 104aa31262a8bf87349daf956ac70f63246e243b Mon Sep 17 00:00:00 2001 From: Sundeep Ghuman Date: Mon, 27 Feb 2017 15:57:58 -0800 Subject: [PATCH 1/2] Create a Tron event for opening the network details page. Bug: 35807357 Test: NA Change-Id: Icbae30d2e4af4e46e289cad490a6531157c54d5e --- proto/src/metrics_constants.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index c1c385aa82074..4bacb58c89920 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -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. From 73938992a819d8c24522054099ff37175c267ab2 Mon Sep 17 00:00:00 2001 From: Sundeep Ghuman Date: Tue, 28 Feb 2017 17:23:09 -0800 Subject: [PATCH 2/2] Fix Wifi Signal strength in the picker. Bug: b/35854026 Test: Tracked in b/35854035 and currently blocked. Change-Id: I6c0c8730e891b29de2db3d935193f3feecac8182 --- .../com/android/settingslib/wifi/AccessPointPreference.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java index 69da5483fe187..3df7e660d0812 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java @@ -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;