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

Commit 9dd830b2 authored by Youngjun Kwak's avatar Youngjun Kwak
Browse files

Add a property for Numpad Button text color 

This allows this color to be overwritten by different Android builds.

Bug: 194414715
Test: Manual (Build and Boot on AAOS and coral)
Change-Id: I9d63f89f31fcc69a45817abd73fca4a4a283a7b2
parent 9964ad83

packages/SystemUI/res/values/colors.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,9 @@ 
    <!-- Shadows under the clock, date and other keyguard text fields -->

    <!-- Shadows under the clock, date and other keyguard text fields -->

    <color name="keyguard_shadow_color">#B2000000</color>

    <color name="keyguard_shadow_color">#B2000000</color>





    <!-- Color for the images in keyguard number pad buttons   -->

    <color name="keyguard_keypad_image_color">@android:color/background_light</color>



    <!-- Color for rounded background for activated user in keyguard user switcher -->

    <!-- Color for rounded background for activated user in keyguard user switcher -->

    <color name="kg_user_switcher_activated_background_color">#26000000</color>

    <color name="kg_user_switcher_activated_background_color">#26000000</color>

    <!-- Icon color for user avatars in keyguard user switcher -->

    <!-- Icon color for user avatars in keyguard user switcher -->

packages/SystemUI/src/com/android/keyguard/NumPadButton.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ import android.view.MotionEvent; 




import androidx.annotation.Nullable;

import androidx.annotation.Nullable;





import com.android.settingslib.Utils;

import com.android.systemui.R;





/**

/**

 * Similar to the {@link NumPadKey}, but displays an image.

 * Similar to the {@link NumPadKey}, but displays an image.
@@ -92,8 +92,7 @@ public class NumPadButton extends AlphaOptimizedImageButton { 
    public void reloadColors() {

    public void reloadColors() {

        if (mAnimator != null) mAnimator.reloadColors(getContext());

        if (mAnimator != null) mAnimator.reloadColors(getContext());





        int textColor = Utils.getColorAttrDefaultColor(getContext(),

        int imageColor = getContext().getColor(R.color.keyguard_keypad_image_color);

                android.R.attr.colorBackground);

        ((VectorDrawable) getDrawable()).setTintList(ColorStateList.valueOf(imageColor));

        ((VectorDrawable) getDrawable()).setTintList(ColorStateList.valueOf(textColor));

    }

    }

}
 
}

packages/SystemUI/res-keyguard/values/styles.xml

+2 −2

File changed.

Contains only whitespace changes.