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

Commit 9d7d256a authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Introduce new colorful wallpaperTextColor" into sc-dev am: 3fc72b1c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921761

Change-Id: I1ad2dbd69fe15190183dccbb34989c0ebcfb52fe
parents a6c18a40 3fc72b1c

packages/SystemUI/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ 
    <attr name="darkIconTheme" format="reference" />

    <attr name="wallpaperTextColor" format="reference|color" />

    <attr name="wallpaperTextColorSecondary" format="reference|color" />

    <attr name="wallpaperTextColorAccent" format="reference|color" />

    <attr name="backgroundProtectedStyle" format="reference" />



    <declare-styleable name="SmartReplyView">

packages/SystemUI/res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ 
        <item name="darkIconTheme">@style/DualToneDarkTheme</item>

        <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>

        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item>

        <item name="wallpaperTextColorAccent">@*android:color/system_accent1_100</item>

        <item name="android:colorError">@*android:color/error_color_material_dark</item>

        <item name="android:colorControlHighlight">@*android:color/primary_text_material_dark</item>

        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
@@ -337,6 +338,7 @@ 
    <style name="Theme.SystemUI.Light">

        <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item>

        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item>

        <item name="wallpaperTextColorAccent">@*android:color/system_accent2_600</item>

        <item name="android:colorError">@*android:color/error_color_material_light</item>

        <item name="android:colorControlHighlight">#40000000</item>

        <item name="shadowRadius">0</item>

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

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie 


    private void initColors() {

        mLockScreenColor = Utils.getColorAttrDefaultColor(getContext(),

                com.android.systemui.R.attr.wallpaperTextColor);

                com.android.systemui.R.attr.wallpaperTextColorAccent);

        mView.setColors(mDozingColor, mLockScreenColor);

        mView.animateDoze(mIsDozing, false);

    }

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { 


        mBgProtection = findViewById(R.id.udfps_keyguard_fp_bg);



        mWallpaperTexColor = Utils.getColorAttrDefaultColor(mContext, R.attr.wallpaperTextColor);

        mWallpaperTexColor = Utils.getColorAttrDefaultColor(mContext,

                R.attr.wallpaperTextColorAccent);

        mTextColorPrimary = Utils.getColorAttrDefaultColor(mContext,

                android.R.attr.textColorPrimary);

    }