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

Commit de044a60 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Bouncer - New PIN animations"

parents 6d5681b7 5a1c26ea

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

+10 −5
Original line number Diff line number Diff line
@@ -13,8 +13,13 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<vector android:height="36sp" android:viewportHeight="36"

        android:viewportWidth="36" android:width="36sp" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="?android:attr/colorAccent" android:pathData="M18,18m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"/>

    <path android:fillColor="?android:attr/textColorPrimaryInverse" android:pathData="M17.59,13.41L21.17,17H7v2h14.17l-3.59,3.59L19,24l6,-6l-6,-6L17.59,13.41zM26,12v12h2V12H26z"/>

<vector

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

     android:height="36sp"

     android:viewportHeight="36"

     android:viewportWidth="36"

     android:width="36sp">

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

        android:pathData="M17.59,13.41L21.17,17H7v2h14.17l-3.59,3.59L19,24l6,-6l-6,-6L17.59,

                          13.41zM26,12v12h2V12H26z"/>

</vector>

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

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

* Copyright 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.

* 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.

*/

-->

<shape

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

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

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

</shape>

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

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

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

  -->



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

    <solid android:color="@color/pin_divider_color" />

</shape>
 
 No newline at end of file

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

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

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

  -->



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

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

        android:radius="40dp"/>

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

+4 −1
Original line number Diff line number Diff line
@@ -17,15 +17,18 @@ 
<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <TextView

        android:id="@+id/digit_text"

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

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        />

    <!-- b/172360102: Setting visibility to gone for now, in order to see if there are many

         issues with removing the alpha characters. -->

    <TextView

        android:id="@+id/klondike_text"

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:visibility="gone"

        />

</merge>