diff options
| author | 2018-05-16 15:40:45 -0400 | |
|---|---|---|
| committer | 2018-05-17 14:02:36 +0000 | |
| commit | d372cdeebed73380b77dba298d393e246e77979b (patch) | |
| tree | ba171aba3e13ea29c0b4b43b4fd380f0543812d2 | |
| parent | b88b59fdee6e300fbadc9124fa9328acd6ef9264 (diff) | |
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
Merged-In: Ided545abec51bafb0b1963d0a5129066194df61f
| -rw-r--r-- | core/res/res/drawable/ic_lock_lockdown.xml (renamed from packages/SystemUI/res/drawable/ic_lock_lockdown.xml) | 2 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/res/drawable/ic_lock_lockdown.xml b/core/res/res/drawable/ic_lock_lockdown.xml index d591aa840ae7..b9685d3e7cca 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 70eac975fa76..770891184049 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3382,4 +3382,5 @@ <java-symbol type="id" name="user_loading" /> <java-symbol type="string" name="battery_saver_description_with_learn_more" /> + <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 4b6528882ca4..d232108ded40 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 |