From 56faba72bdec5a78d6620ff87fe00b56a5d4acf8 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Fri, 6 Mar 2020 16:53:47 +0800 Subject: [PATCH] [Wi-Fi] Remove $ icon for metered Wi-Fi networks It has some problems: 1. The $ icon does not disappear right after set unmetered. 2. Security icon is at the same position and it takes higher priority than the $ icon. It's not a consistent UX since $ icon is only for open network. 3. No localization design for the $ icon. Bug: 150912127 Test: Manual In Wi-Fi picker, check if $ icon is visible on metered Wi-Fi networks. Change-Id: Ia929bbaa65367fe6f3bfba7fdd924c23622ca3ca --- .../com/android/settingslib/wifi/WifiEntryPreference.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java index 4ebb1029ff045..6a7000eb92c81 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java @@ -43,10 +43,6 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt R.attr.state_encrypted }; - private static final int[] STATE_METERED = { - R.attr.state_metered - }; - private static final int[] FRICTION_ATTRS = { R.attr.wifi_friction }; @@ -201,8 +197,6 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt if ((mWifiEntry.getSecurity() != WifiEntry.SECURITY_NONE) && (mWifiEntry.getSecurity() != WifiEntry.SECURITY_OWE)) { mFrictionSld.setState(STATE_SECURED); - } else if (mWifiEntry.isMetered()) { - mFrictionSld.setState(STATE_METERED); } frictionImageView.setImageDrawable(mFrictionSld.getCurrent()); }