diff options
| author | Matt Pietal <mpietal@google.com> | 2021-01-15 14:08:55 -0500 |
|---|---|---|
| committer | Matt Pietal <mpietal@google.com> | 2021-01-20 09:26:35 -0500 |
| commit | 5a1c26ea2996ba383af99d90fcf3c241d6be816b (patch) | |
| tree | 3399c3f22461df70ca74da5ee1cb5ede08c6cfb6 /packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java | |
| parent | 58679dbef94801628afb6039343025f82209c2c8 (diff) | |
Bouncer - New PIN animations
Align all PIN views (PIN, SIM, PUK) to latest UX guidance, including
new heights and animations for color and corner radius. Mark all alpha
chars as GONE for now, and potentially remove in the near future,
pending feedback.
Bug: 172360102
Test: manual
Change-Id: I53cefb950daad29acb70c00b71b44e073ab6dac5
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java index 4ddfccb21c73..6a6b964c2a8f 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java @@ -27,10 +27,8 @@ import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Rect; import android.util.AttributeSet; -import android.view.ContextThemeWrapper; import android.view.KeyEvent; import android.view.View; -import android.widget.ImageButton; import com.android.internal.widget.LockscreenCredential; import com.android.settingslib.Utils; @@ -42,10 +40,9 @@ import com.android.systemui.R; public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView { protected PasswordTextView mPasswordEntry; - private View mOkButton; - private ImageButton mDeleteButton; + private NumPadButton mOkButton; + private NumPadButton mDeleteButton; private NumPadKey[] mButtons = new NumPadKey[10]; - private View mDivider; public KeyguardPinBasedInputView(Context context) { this(context, null); @@ -152,7 +149,6 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView mDeleteButton = findViewById(R.id.delete_button); mDeleteButton.setVisibility(View.VISIBLE); - mDivider = findViewById(R.id.divider); mButtons[0] = findViewById(R.id.key0); mButtons[1] = findViewById(R.id.key1); @@ -181,12 +177,9 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView int deleteColor = Utils.getColorAttr(getContext(), android.R.attr.textColorSecondary) .getDefaultColor(); mDeleteButton.setImageTintList(ColorStateList.valueOf(deleteColor)); - mDivider.setBackground(getContext().getDrawable(R.drawable.pin_divider)); - ContextThemeWrapper themedContext = new ContextThemeWrapper(mContext, - R.style.Widget_TextView_NumPadKey); - mDeleteButton.setBackground(themedContext.getDrawable(R.drawable.ripple_drawable_pin)); - mOkButton.setBackground(themedContext.getDrawable(R.drawable.ripple_drawable_pin)); + mDeleteButton.reloadColors(); + mOkButton.reloadColors(); } @Override |