diff options
5 files changed, 56 insertions, 20 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java index a836dcbf848b..777a50f0936a 100644 --- a/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java +++ b/packages/SystemUI/src/com/android/keyguard/EmergencyButton.java @@ -16,8 +16,6 @@ package com.android.keyguard; -import static com.android.systemui.Flags.gsfBouncer; - import android.content.Context; import android.graphics.Typeface; import android.graphics.drawable.Drawable; @@ -30,6 +28,7 @@ import android.widget.Button; import com.android.internal.util.EmergencyAffordanceManager; import com.android.systemui.Flags; +import com.android.systemui.FontStyles; import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants; /** @@ -75,10 +74,8 @@ public class EmergencyButton extends Button { return false; }); } - if (gsfBouncer() || Flags.bouncerUiRevamp2()) { - setTypeface(Typeface.create("gsf-title-medium", Typeface.NORMAL)); - } if (Flags.bouncerUiRevamp2()) { + setTypeface(Typeface.create(FontStyles.GSF_TITLE_MEDIUM, Typeface.NORMAL)); Drawable background = getBackground(); int bgColor = mContext.getColor(KeyguardBouncerConstants.Color.actionButtonBg); if (background != null) { diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index 63d4fe3f1b01..335a910eb106 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -32,7 +32,7 @@ import static androidx.constraintlayout.widget.ConstraintSet.START; import static androidx.constraintlayout.widget.ConstraintSet.TOP; import static androidx.constraintlayout.widget.ConstraintSet.WRAP_CONTENT; -import static com.android.systemui.Flags.gsfBouncer; +import static com.android.systemui.Flags.bouncerUiRevamp2; import static com.android.systemui.plugins.FalsingManager.LOW_PENALTY; import static java.lang.Integer.max; @@ -99,6 +99,7 @@ import com.android.keyguard.KeyguardSecurityModel.SecurityMode; import com.android.settingslib.Utils; import com.android.settingslib.drawable.CircleFramedDrawable; import com.android.systemui.Flags; +import com.android.systemui.FontStyles; import com.android.systemui.Gefingerpoken; import com.android.systemui.classifier.FalsingA11yDelegate; import com.android.systemui.plugins.FalsingManager; @@ -1348,8 +1349,9 @@ public class KeyguardSecurityContainer extends ConstraintLayout { true); mUserSwitcherViewGroup = mView.findViewById(R.id.keyguard_bouncer_user_switcher); mUserSwitcher = mView.findViewById(R.id.user_switcher_header); - if (gsfBouncer()) { - mUserSwitcher.setTypeface(Typeface.create("gsf-label-medium", Typeface.NORMAL)); + if (bouncerUiRevamp2()) { + mUserSwitcher.setTypeface( + Typeface.create(FontStyles.GSF_LABEL_MEDIUM, Typeface.NORMAL)); } } diff --git a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java index 3ceba5a97b17..b152ff348e22 100644 --- a/packages/SystemUI/src/com/android/keyguard/NumPadKey.java +++ b/packages/SystemUI/src/com/android/keyguard/NumPadKey.java @@ -15,7 +15,7 @@ */ package com.android.keyguard; -import static com.android.systemui.Flags.gsfBouncer; +import static com.android.systemui.Flags.bouncerUiRevamp2; import android.content.Context; import android.content.res.Configuration; @@ -37,7 +37,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; import com.android.settingslib.Utils; -import com.android.systemui.Flags; +import com.android.systemui.FontStyles; import com.android.systemui.bouncer.shared.constants.PinBouncerConstants.Color; import com.android.systemui.bouncer.ui.helper.BouncerHapticPlayer; import com.android.systemui.res.R; @@ -145,6 +145,11 @@ public class NumPadKey extends ViewGroup implements NumPadAnimationListener { } else { mAnimator = null; } + + if (bouncerUiRevamp2()) { + mDigitText.setTypeface( + Typeface.create(FontStyles.GSF_LABEL_LARGE_EMPHASIZED, Typeface.NORMAL)); + } } @Override @@ -160,9 +165,6 @@ public class NumPadKey extends ViewGroup implements NumPadAnimationListener { int klondikeColor = Utils.getColorAttr(getContext(), android.R.attr.textColorSecondary) .getDefaultColor(); mDigitText.setTextColor(textColor); - if (gsfBouncer() || Flags.bouncerUiRevamp2()) { - mDigitText.setTypeface(Typeface.create("gsf-label-large-emphasized", Typeface.NORMAL)); - } mKlondikeText.setTextColor(klondikeColor); if (mAnimator != null) mAnimator.reloadColors(getContext()); diff --git a/packages/SystemUI/src/com/android/systemui/FontStyles.kt b/packages/SystemUI/src/com/android/systemui/FontStyles.kt index d8cd6c87a1ac..5315dcbc4790 100644 --- a/packages/SystemUI/src/com/android/systemui/FontStyles.kt +++ b/packages/SystemUI/src/com/android/systemui/FontStyles.kt @@ -18,11 +18,45 @@ package com.android.systemui /** String tokens for the different GSF font families. */ object FontStyles { + // baseline + const val GSF_DISPLAY_LARGE = "variable-display-large" + const val GSF_DISPLAY_MEDIUM = "variable-display-medium" + const val GSF_DISPLAY_SMALL = "variable-display-small" - const val GSF_LABEL_MEDIUM = "gsf-label-medium" - const val GSF_LABEL_LARGE = "gsf-label-large" + const val GSF_HEADLINE_LARGE = "variable-headline-large" + const val GSF_HEADLINE_MEDIUM = "variable-headline-medium" + const val GSF_HEADLINE_SMALL = "variable-headline-small" - const val GSF_BODY_MEDIUM = "gsf-body-medium" + const val GSF_TITLE_LARGE = "variable-title-large" + const val GSF_TITLE_MEDIUM = "variable-title-medium" + const val GSF_TITLE_SMALL = "variable-title-small" - const val GSF_TITLE_SMALL_EMPHASIZED = "gsf-title-small-emphasized" + const val GSF_LABEL_LARGE = "variable-label-large" + const val GSF_LABEL_MEDIUM = "variable-label-medium" + const val GSF_LABEL_SMALL = "variable-label-small" + + const val GSF_BODY_LARGE = "variable-body-large" + const val GSF_BODY_MEDIUM = "variable-body-medium" + const val GSF_BODY_SMALL = "variable-body-small" + + // emphasized + const val GSF_DISPLAY_LARGE_EMPHASIZED = "variable-display-large-emphasized" + const val GSF_DISPLAY_MEDIUM_EMPHASIZED = "variable-display-medium-emphasized" + const val GSF_DISPLAY_SMALL_EMPHASIZED = "variable-display-small-emphasized" + + const val GSF_HEADLINE_LARGE_EMPHASIZED = "variable-headline-large-emphasized" + const val GSF_HEADLINE_MEDIUM_EMPHASIZED = "variable-headline-medium-emphasized" + const val GSF_HEADLINE_SMALL_EMPHASIZED = "variable-headline-small-emphasized" + + const val GSF_TITLE_LARGE_EMPHASIZED = "variable-title-large-emphasized" + const val GSF_TITLE_MEDIUM_EMPHASIZED = "variable-title-medium-emphasized" + const val GSF_TITLE_SMALL_EMPHASIZED = "variable-title-small-emphasized" + + const val GSF_LABEL_LARGE_EMPHASIZED = "variable-label-large-emphasized" + const val GSF_LABEL_MEDIUM_EMPHASIZED = "variable-label-medium-emphasized" + const val GSF_LABEL_SMALL_EMPHASIZED = "variable-label-small-emphasized" + + const val GSF_BODY_LARGE_EMPHASIZED = "variable-body-large-emphasized" + const val GSF_BODY_MEDIUM_EMPHASIZED = "variable-body-medium-emphasized" + const val GSF_BODY_SMALL_EMPHASIZED = "variable-body-small-emphasized" } diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerMessageView.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerMessageView.kt index b53a8a1fe671..b463dd447f2b 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerMessageView.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/BouncerMessageView.kt @@ -24,6 +24,7 @@ import com.android.keyguard.BouncerKeyguardMessageArea import com.android.keyguard.KeyguardMessageArea import com.android.keyguard.KeyguardMessageAreaController import com.android.systemui.Flags +import com.android.systemui.FontStyles import com.android.systemui.res.R class BouncerMessageView : LinearLayout { @@ -45,12 +46,12 @@ class BouncerMessageView : LinearLayout { primaryMessageView = findViewById(R.id.bouncer_primary_message_area) secondaryMessageView = findViewById(R.id.bouncer_secondary_message_area) - if (Flags.gsfBouncer() || Flags.bouncerUiRevamp2()) { + if (Flags.bouncerUiRevamp2()) { primaryMessageView?.apply { - typeface = Typeface.create("gsf-title-large-emphasized", Typeface.NORMAL) + typeface = Typeface.create(FontStyles.GSF_TITLE_LARGE_EMPHASIZED, Typeface.NORMAL) } secondaryMessageView?.apply { - typeface = Typeface.create("gsf-title-medium-emphasized", Typeface.NORMAL) + typeface = Typeface.create(FontStyles.GSF_TITLE_MEDIUM_EMPHASIZED, Typeface.NORMAL) } } } |