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

Commit c5aa0ab2 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am ba551061: Merge "Don\'t clip keyguard security container children (e.g. glow pad)" into klp-dev 

* commit 'ba551061':
  Don't clip keyguard security container children (e.g. glow pad)
parents 663345cb ba551061

packages/Keyguard/res/layout-land/keyguard_host_view.xml

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:clipChildren="false"

            android:clipToPadding="false"

            androidprv:layout_childType="challenge"

            androidprv:layout_centerWithinArea="0.55">

            <com.android.keyguard.KeyguardSecurityViewFlipper

packages/Keyguard/res/layout-port/keyguard_host_view.xml

+4 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 
    <com.android.keyguard.SlidingChallengeLayout

        android:id="@+id/sliding_layout"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="match_parent"

        android:clipChildren="false">



        <FrameLayout

            android:layout_width="match_parent"
@@ -64,6 +65,8 @@ 
            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:clipChildren="false"

            android:clipToPadding="false"

            androidprv:layout_maxHeight="@dimen/keyguard_security_height"

            androidprv:layout_childType="challenge"

            android:padding="0dp"

packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ 
            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:clipChildren="false"

            android:clipToPadding="false"

            androidprv:layout_centerWithinArea="0.5"

            androidprv:layout_childType="challenge"

            android:layout_gravity="center_horizontal|bottom">