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

Commit 116a243c authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "PIN bouncer - Update animations" into sc-dev am: 8963b30f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e53f4c19bb35bea2ce76e49e1c108e738df6249
parents 19ca8ebd 8963b30f

packages/SystemUI/res-keyguard/drawable/ic_backspace_black_24dp.xml→packages/SystemUI/res-keyguard/drawable/ic_backspace_24dp.xml

+2 −2
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2017 The Android Open Source Project

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.
@@ -20,6 +20,6 @@ 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:fillColor="?android:attr/colorBackground"

        android:pathData="M9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59L17.59,17L14,13.41L10.41,17L9,15.59zM21,6H8l-4.5,6L8,18h13V6M21,4c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H8c-0.63,0 -1.22,-0.3 -1.6,-0.8L1,12l5.4,-7.2C6.78,4.3 7.37,4 8,4H21L21,4z"/>

</vector>

packages/SystemUI/res-keyguard/drawable/num_pad_key_background.xml

+20 −5
Original line number Diff line number Diff line
@@ -16,8 +16,23 @@ 
* limitations under the License.

*/

-->

<shape

    xmlns:android="http://schemas.android.com/apk/res/android">

  <solid android:color="?android:attr/colorBackground" />

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

  <item android:id="@+id/background">

    <shape>

      <solid android:color="?android:attr/colorControlNormal" />

      <corners android:radius="10dp" />

    </shape>

  </item>

  <item android:id="@+id/ripple">

    <ripple

        android:color="?android:attr/colorControlHighlight">

      <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

          <solid android:color="?android:attr/colorControlNormal" />

          <corners android:radius="10dp" />

        </shape>

    </item>

    </ripple>

  </item>

</layer-list>

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
    <dimen name="keyguard_security_view_top_margin">8dp</dimen>

    <dimen name="keyguard_security_view_lateral_margin">36dp</dimen>



    <dimen name="keyguard_eca_top_margin">24dp</dimen>

    <dimen name="keyguard_eca_top_margin">18dp</dimen>



    <!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text.

         Should be 0 on devices with plenty of room (e.g. tablets) -->

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

+2 −3
Original line number Diff line number Diff line
@@ -52,9 +52,8 @@ 
        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>

    <style name="NumPadKey.Delete">

        <item name="android:src">@drawable/ic_backspace_black_24dp</item>

        <item name="android:tint">?android:attr/textColorSecondary</item>

        <item name="android:tintMode">src_in</item>

        <item name="android:colorControlNormal">?android:attr/textColorSecondary</item>

        <item name="android:src">@drawable/ic_backspace_24dp</item>

    </style>

    <style name="NumPadKey.Enter">

      <item name="android:colorControlNormal">?android:attr/textColorSecondary</item>

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

+0 −6
Original line number Diff line number Diff line
@@ -24,14 +24,12 @@ import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_TIMEOUT; 
import static com.android.keyguard.KeyguardSecurityView.PROMPT_REASON_USER_REQUEST;



import android.content.Context;

import android.content.res.ColorStateList;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.view.KeyEvent;

import android.view.View;



import com.android.internal.widget.LockscreenCredential;

import com.android.settingslib.Utils;

import com.android.systemui.R;



/**
@@ -188,10 +186,6 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 
            key.reloadColors();

        }

        mPasswordEntry.reloadColors();

        int deleteColor = Utils.getColorAttr(getContext(), android.R.attr.textColorSecondary)

                .getDefaultColor();

        mDeleteButton.setImageTintList(ColorStateList.valueOf(deleteColor));



        mDeleteButton.reloadColors();

        mOkButton.reloadColors();

    }