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

Commit e3c9ccc4 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

New PIN pad design 

Moved "delete key," replaced confirmation button and reduced
the size of the ripples, for improved security.

Change-Id: Idc7a86490c3ca1d9fd69f4f5c6f8ede07909fea2
Test: visual
Fixes: 74259090
parent f7994fe6

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

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

  ~ 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

  -->

<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>
 
 No newline at end of file

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

0 → 100644
+20 −0
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_pin_view.xml

+6 −22
Original line number Diff line number Diff line
@@ -57,24 +57,6 @@ 
                    android:textColor="?attr/wallpaperTextColor"

                    android:contentDescription="@string/keyguard_accessibility_pin_area"

                    />

            <ImageButton

                    android:id="@+id/delete_button"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:gravity="center_vertical"

                    android:src="@drawable/ic_backspace_black_24dp"

                    android:clickable="true"

                    android:paddingTop="8dip"

                    android:paddingBottom="8dip"

                    android:paddingRight="0dp"

                    android:paddingLeft="0dp"

                    android:background="@drawable/ripple_drawable"

                    android:contentDescription="@string/keyboardview_keycode_delete"

                    android:layout_alignEnd="@+id/pinEntry"

                    android:layout_alignParentRight="true"

                    android:tint="@color/pin_delete_color"

                    android:tintMode="src_in"

                    />

            <View

                    android:id="@+id/divider"

                    android:layout_width="match_parent"
@@ -186,10 +168,14 @@ 
                android:layout_weight="1"

                android:orientation="horizontal"

                >

            <Space

            <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/delete_button"

                    android:layout_width="0px"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:background="@drawable/ripple_drawable_pin"

                    android:contentDescription="@string/keyboardview_keycode_delete"

                    style="@style/Keyguard.ImageButton.NumPadDelete"

                    />

            <com.android.keyguard.NumPadKey

                    android:id="@+id/key0"
@@ -204,10 +190,8 @@ 
                    android:layout_width="0px"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:paddingBottom="11sp"

                    android:src="@drawable/ic_done_black_24dp"

                    style="@style/Keyguard.ImageButton.NumPadEnter"

                    android:background="@drawable/ripple_drawable"

                    android:background="@drawable/ripple_drawable_pin"

                    android:contentDescription="@string/keyboardview_keycode_enter"

                    />

        </LinearLayout>

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

+7 −23
Original line number Diff line number Diff line
@@ -71,24 +71,6 @@ 
                    android:textColor="?attr/wallpaperTextColor"

                    android:contentDescription="@string/keyguard_accessibility_sim_pin_area"

                    />

            <ImageButton

                    android:id="@+id/delete_button"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:gravity="center_vertical"

                    android:src="@drawable/ic_backspace_black_24dp"

                    android:clickable="true"

                    android:paddingTop="8dip"

                    android:paddingBottom="8dip"

                    android:paddingRight="0dp"

                    android:paddingLeft="0dp"

                    android:background="@drawable/ripple_drawable"

                    android:contentDescription="@string/keyboardview_keycode_delete"

                    android:layout_alignEnd="@+id/pinEntry"

                    android:layout_alignParentRight="true"

                    android:tint="@color/pin_delete_color"

                    android:tintMode="src_in"

                    />

            <View

                    android:id="@+id/divider"

                    android:layout_width="match_parent"
@@ -196,10 +178,14 @@ 
                android:layout_weight="1"

                android:orientation="horizontal"

                >

            <Space

            <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/delete_button"

                    android:layout_width="0px"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:background="@drawable/ripple_drawable_pin"

                    android:contentDescription="@string/keyboardview_keycode_delete"

                    style="@style/Keyguard.ImageButton.NumPadDelete"

                    />

            <com.android.keyguard.NumPadKey

                    android:id="@+id/key0"
@@ -209,15 +195,13 @@ 
                    androidprv:textView="@+id/simPinEntry"

                    androidprv:digit="0"

                    />

            <ImageButton

            <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/key_enter"

                    android:layout_width="0px"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:paddingBottom="11sp"

                    android:src="@drawable/ic_done_black_24dp"

                    style="@style/Keyguard.ImageButton.NumPadEnter"

                    android:background="@drawable/ripple_drawable"

                    android:background="@drawable/ripple_drawable_pin"

                    android:contentDescription="@string/keyboardview_keycode_enter"

                    />

        </LinearLayout>

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

+7 −23
Original line number Diff line number Diff line
@@ -72,24 +72,6 @@ 
                    android:textColor="?attr/wallpaperTextColor"

                    android:contentDescription="@string/keyguard_accessibility_sim_puk_area"

                    />

            <ImageButton

                    android:id="@+id/delete_button"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:gravity="center_vertical"

                    android:src="@drawable/ic_backspace_black_24dp"

                    android:clickable="true"

                    android:paddingTop="8dip"

                    android:paddingBottom="8dip"

                    android:paddingRight="0dp"

                    android:paddingLeft="0dp"

                    android:background="@drawable/ripple_drawable"

                    android:contentDescription="@string/keyboardview_keycode_delete"

                    android:layout_alignEnd="@+id/pinEntry"

                    android:layout_alignParentRight="true"

                    android:tint="@color/pin_delete_color"

                    android:tintMode="src_in"

                    />

            <View

                    android:id="@+id/divider"

                    android:layout_width="match_parent"
@@ -197,10 +179,14 @@ 
                android:layout_weight="1"

                android:orientation="horizontal"

                >

            <Space

            <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/delete_button"

                    android:layout_width="0px"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:background="@drawable/ripple_drawable_pin"

                    android:contentDescription="@string/keyboardview_keycode_delete"

                    style="@style/Keyguard.ImageButton.NumPadDelete"

                    />

            <com.android.keyguard.NumPadKey

                    android:id="@+id/key0"
@@ -210,15 +196,13 @@ 
                    androidprv:textView="@+id/pukEntry"

                    androidprv:digit="0"

                    />

            <ImageButton

            <com.android.keyguard.AlphaOptimizedImageButton

                    android:id="@+id/key_enter"

                    android:layout_width="0px"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:paddingBottom="11sp"

                    android:src="@drawable/ic_done_black_24dp"

                    style="@style/Keyguard.ImageButton.NumPadEnter"

                    android:background="@drawable/ripple_drawable"

                    android:background="@drawable/ripple_drawable_pin"

                    android:contentDescription="@string/keyboardview_keycode_enter"

                    />

        </LinearLayout>