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

Commit 957f4360 authored by lbill's avatar lbill
Browse files

4/ Adjust keyguard pattern view size to follow up UX deck 

Current Keyguard pattern view size is 420dp
UX define 248dp without padding, and 348dp includes padding

1. Set Max size for Keyguard pattern view layout
   Reference dimen biometric_auth_pattern_view_max_size
2. Remove redundant keyguard_security_height
   (sw540dp-port & sw720dp)

Bug: 243008023
Bug: 234847272
Test: atest SystemUITests
Test: make and check visual on phone, foldable, tablet
Change-Id: I2514b14a74a8541a85a4c72d9d51d74363d35a89
Merged-In: I2514b14a74a8541a85a4c72d9d51d74363d35a89
parent e7786409

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxWidth="@dimen/biometric_auth_pattern_view_max_size"

    android:layout_gravity="center_horizontal|bottom"

    android:clipChildren="false"

    android:clipToPadding="false">

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

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

<!--

/* //device/apps/common/assets/res/any/dimens.xml

**

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

*/

-->

<resources>

    <!-- Height of the sliding KeyguardSecurityContainer

        (includes 2x keyguard_security_view_top_margin) -->

    <dimen name="keyguard_security_height">550dp</dimen>

</resources>

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

+0 −5
Original line number Diff line number Diff line
@@ -17,10 +17,5 @@ 
*/

-->

<resources>



    <!-- Height of the sliding KeyguardSecurityContainer

         (includes 2x keyguard_security_view_top_margin) -->

    <dimen name="keyguard_security_height">470dp</dimen>



    <dimen name="widget_big_font_size">100dp</dimen>

</resources>

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

+0 −3
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ 
         (includes 2x keyguard_security_view_top_margin) -->

    <dimen name="keyguard_security_height">420dp</dimen>



    <!-- Max Height of the sliding KeyguardSecurityContainer

         (includes 2x keyguard_security_view_top_margin) -->



    <!-- pin/password field max height -->

    <dimen name="keyguard_password_height">80dp</dimen>