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

Commit d2331074 authored by Chandru S's avatar Chandru S
Browse files

Update emergency button, 2-line messages font and color 

Bug: 394140399
Flag: com.android.systemui.bouncer_ui_revamp_2
Test: verified manually
Change-Id: I3bed9d0e1febf3681b021347389c6000b58dbfb5
parent c2b66c9b

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

+16 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.systemui.Flags.gsfBouncer; 


import android.content.Context;

import android.graphics.Typeface;

import android.graphics.drawable.Drawable;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.view.MotionEvent;
@@ -28,6 +29,8 @@ import android.view.ViewConfiguration; 
import android.widget.Button;



import com.android.internal.util.EmergencyAffordanceManager;

import com.android.systemui.Flags;

import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants;



/**

 * This class implements a smart emergency button that updates itself based
@@ -72,6 +75,19 @@ public class EmergencyButton extends Button { 
                return false;

            });

        }

        if (gsfBouncer() || Flags.bouncerUiRevamp2()) {

            setTypeface(Typeface.create("gsf-title-medium", Typeface.NORMAL));

        }

        if (Flags.bouncerUiRevamp2()) {

            Drawable background = getBackground();

            int bgColor = mContext.getColor(KeyguardBouncerConstants.Color.actionButtonBg);

            if (background != null) {

                background.setTint(bgColor);

            } else {

                setBackgroundColor(bgColor);

            }

            setTextColor(mContext.getColor(KeyguardBouncerConstants.Color.actionButtonText));

        }

    }



    @Override
@@ -125,9 +141,6 @@ public class EmergencyButton extends Button { 
                textId = com.android.internal.R.string.lockscreen_emergency_call;

            }

            setText(textId);

            if (gsfBouncer()) {

                setTypeface(Typeface.create("gsf-title-medium", Typeface.NORMAL));

            }

        } else {

            setVisibility(View.GONE);

        }

packages/SystemUI/src/com/android/systemui/bouncer/shared/constants/KeyguardBouncerConstants.kt

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ object KeyguardBouncerConstants { 
        @Deprecated(DEPRECATION_MSG)

        const val EMERGENCY_BUTTON = com.android.internal.R.color.materialColorTertiaryFixed

    }



    object Color {

        @JvmField val actionButtonText = colors.materialColorOnSecondaryContainer

        @JvmField val actionButtonBg = colors.materialColorSecondaryContainer

    }

}



private fun <T> c(old: T, new: T): T {

packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerMessageView.kt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class BouncerMessageView : LinearLayout { 
        primaryMessageView = findViewById(R.id.bouncer_primary_message_area)

        secondaryMessageView = findViewById(R.id.bouncer_secondary_message_area)



        if (Flags.gsfBouncer()) {

        if (Flags.gsfBouncer() || Flags.bouncerUiRevamp2()) {

            primaryMessageView?.apply {

                typeface = Typeface.create("gsf-title-large-emphasized", Typeface.NORMAL)

            }