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

Commit 27585a46 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update confirm and delete button images to match spec" into main

parents 2c3fffaf 9e78b658

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

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2025 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.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    android:width="40dp"

    android:height="40dp"

    android:viewportHeight="40"

    android:viewportWidth="40">

    <path

        android:fillColor="#F7DAEE"

        android:fillType="evenOdd"

        android:pathData="M20.76,19C21.65,19 22.096,17.924 21.467,17.294L19.284,15.105C18.895,14.716 18.895,14.085 19.285,13.695C19.674,13.306 20.306,13.306 20.695,13.695L26.293,19.293C26.683,19.683 26.683,20.317 26.293,20.707L20.705,26.295C20.315,26.685 19.683,26.686 19.292,26.298C18.9,25.907 18.898,25.272 19.29,24.88L21.463,22.707C22.093,22.077 21.647,21 20.756,21H10C9.448,21 9,20.552 9,20C9,19.448 9.448,19 10,19H20.76ZM32,26C32,26.552 31.552,27 31,27C30.448,27 30,26.552 30,26V14C30,13.448 30.448,13 31,13C31.552,13 32,13.448 32,14V26Z"

        android:strokeColor="#F7DAEE"

        android:strokeLineCap="round"

        android:strokeLineJoin="round"

        android:strokeWidth="2" />

</vector>

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2025 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.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



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

    android:width="40dp"

    android:height="40dp"

    android:viewportHeight="40"

    android:viewportWidth="40">

    <path

        android:fillColor="#ECDFE5"

        android:pathData="M18.792,26.5L23.333,21.958L27.875,26.5L29.875,24.542L25.292,20L29.792,15.458L27.833,13.5L23.333,18.042L18.792,13.5L16.792,15.458L21.375,20L16.792,24.542L18.792,26.5ZM14.708,33.333C14.292,33.333 13.875,33.236 13.458,33.042C13.069,32.847 12.75,32.569 12.5,32.208L3.333,20L12.458,7.792C12.708,7.431 13.028,7.153 13.417,6.958C13.833,6.764 14.264,6.667 14.708,6.667H33.917C34.694,6.667 35.347,6.944 35.875,7.5C36.431,8.028 36.708,8.681 36.708,9.458V30.542C36.708,31.319 36.431,31.986 35.875,32.542C35.347,33.069 34.694,33.333 33.917,33.333H14.708Z" />

</vector>

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

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import androidx.annotation.CallSuper; 


import com.android.app.animation.Interpolators;

import com.android.internal.widget.LockscreenCredential;

import com.android.systemui.Flags;

import com.android.systemui.res.R;



import java.util.ArrayList;
@@ -178,7 +179,13 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 


        mOkButton = findViewById(R.id.key_enter);



        if (Flags.bouncerUiRevamp2()) {

            mOkButton.setImageResource(R.drawable.pin_bouncer_confirm);

        }

        mDeleteButton = findViewById(R.id.delete_button);

        if (Flags.bouncerUiRevamp2()) {

            mDeleteButton.setImageResource(R.drawable.pin_bouncer_delete);

        }

        mDeleteButton.setVisibility(View.VISIBLE);



        mButtons[0] = findViewById(R.id.key0);