From 2fba1943fa9249c182ad3f1b800d4d79f5d94527 Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Mon, 17 Dec 2018 16:58:25 -0800
Subject: [PATCH] Fix bug of not showing locked icon in WifiSettings

This bug only exist by launching WifiSettings from quick settings. Quick
settings launch this page by intent, where we use Theme.Settings.
However we only have frictionIconColor in Theme.SubSettings, not
Theme.Settings.

This CL move related attr to correct theme, so we won't show invisible
icon anymore.

Bug: 120710149
Test: Manual
Change-Id: Iae07f6ca19eda0bfbc352f03787b5a583c4066f2
---
 res/values/themes.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 390be584e21..e972ea728ab 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -32,9 +32,13 @@
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>
         <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+
+        <!-- For wifi icon -->
         <item name="wifi_signal">@drawable/wifi_signal</item>
         <item name="wifi_signal_color">?android:attr/colorAccent</item>
         <item name="wifi_friction">@drawable/wifi_friction</item>
+        <item name="frictionIconColor">?android:colorControlNormal</item>
+
         <item name="side_margin">@dimen/settings_side_margin</item>
         <item name="suwListItemIconColor">?android:attr/colorAccent</item>
 
@@ -71,9 +75,6 @@
         <item name="android:actionBarStyle">@style/Widget.ActionBar.SubSettings</item>
 
         <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
-
-        <!-- Friction icon color for wifi preferences -->
-        <item name="frictionIconColor">?android:colorControlNormal</item>
     </style>
 
     <style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>