Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21125435 authored by Alison Cichowlas's avatar Alison Cichowlas
Browse files

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
parent 9cf1839e

packages/SystemUI/res/drawable/ic_lock_lockdown.xml→core/res/res/drawable/ic_lock_lockdown.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -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