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

Commit 8bef504a authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge changes Ia562ca7d,I7633c4a8 into main 

* changes:
  Invalidate patternview after animation.
  Do not autoscale textsize
parents 6712969c 4e5f4bf1

packages/SystemUI/res-keyguard/layout/keyguard_num_pad_key.xml

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
    <TextView

        android:id="@+id/digit_text"

        style="@style/Widget.TextView.NumPadKey.Digit"

        android:autoSizeMaxTextSize="32sp"

        android:autoSizeTextType="uniform"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        />

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
        <item name="android:singleLine">true</item>

        <item name="android:gravity">center_horizontal|center_vertical</item>

        <item name="android:background">@null</item>

        <item name="android:textSize">32sp</item>

        <item name="android:textSize">32dp</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

        <item name="android:paddingBottom">-16dp</item>

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

+4 −1
Original line number Diff line number Diff line
@@ -281,7 +281,10 @@ public class KeyguardPatternView extends KeyguardInputView 
            setAlpha(1f);

            mAppearAnimationUtils.startAnimation2d(

                    mLockPatternView.getCellStates(),

                    () -> enableClipping(true),

                    () -> {

                        enableClipping(true);

                        mLockPatternView.invalidate();

                    },

                    KeyguardPatternView.this);

        });

        if (!TextUtils.isEmpty(mSecurityMessageDisplay.getText())) {