From 211254350980dd79a6b14de716e0fd462c4adf43 Mon Sep 17 00:00:00 2001
From: Alison Cichowlas <asc@google.com>
Date: Wed, 16 May 2018 15:40:45 -0400
Subject: [PATCH] Fix lockdown icon dark mode coloring.

Recoloring icons only works for resources in core/res not in SysUI/res.

Bug: 78619585
Test: Manual with dark background.

Change-Id: Ided545abec51bafb0b1963d0a5129066194df61f
---
 .../SystemUI => core/res}/res/drawable/ic_lock_lockdown.xml     | 2 +-
 core/res/res/values/symbols.xml                                 | 2 ++
 .../com/android/systemui/globalactions/GlobalActionsDialog.java | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename {packages/SystemUI => core/res}/res/drawable/ic_lock_lockdown.xml (97%)

diff --git a/packages/SystemUI/res/drawable/ic_lock_lockdown.xml b/core/res/res/drawable/ic_lock_lockdown.xml
similarity index 97%
rename from packages/SystemUI/res/drawable/ic_lock_lockdown.xml
rename to core/res/res/drawable/ic_lock_lockdown.xml
index d591aa840ae76..b9685d3e7ccad 100644
--- a/packages/SystemUI/res/drawable/ic_lock_lockdown.xml
+++ b/core/res/res/drawable/ic_lock_lockdown.xml
@@ -21,6 +21,6 @@ Copyright (C) 2018 The Android Open Source Project
         android:tint="?attr/colorControlNormal">
 
     <path
-        android:fillColor="#000000"
+        android:fillColor="#FF000000"
         android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.8 -2.2,-5.0 -5.0,-5.0C9.2,1.0 7.0,3.2 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM12.0,17.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0c1.1,0.0 2.0,0.9 2.0,2.0S13.1,17.0 12.0,17.0zM15.1,8.0L8.9,8.0L8.9,6.0c0.0,-1.7 1.4,-3.1 3.1,-3.1c1.7,0.0 3.1,1.4 3.1,3.1L15.1,8.0z"/>
 </vector>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index de810aa49c5f6..42aad6a7b86e6 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3387,4 +3387,6 @@
   <java-symbol type="attr" name="opticalInsetTop" />
   <java-symbol type="attr" name="opticalInsetRight" />
   <java-symbol type="attr" name="opticalInsetBottom" />
+
+  <java-symbol type="drawable" name="ic_lock_lockdown" />
 </resources>
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index 4b6528882ca4e..d232108ded40d 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -690,7 +690,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener,
     }
 
     private Action getLockdownAction() {
-        return new SinglePressAction(com.android.systemui.R.drawable.ic_lock_lockdown,
+        return new SinglePressAction(R.drawable.ic_lock_lockdown,
                 R.string.global_action_lockdown) {
 
             @Override