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

Commit e7376e2c authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Initial pass at re-enabling face unlock in new keyguard." into jb-mr1-dev

parents 18e87680 000464ac

core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 


        <!-- Area to overlay FaceLock -->

        <RelativeLayout

            android:id="@+id/faceLockAreaView"

            android:id="@+id/face_unlock_area_view"

            android:visibility="invisible"

            android:layout_width="530dip"

            android:layout_height="530dip"

core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ 


        <!-- Area to overlay FaceLock -->

        <RelativeLayout

            android:id="@+id/faceLockAreaView"

            android:id="@+id/face_unlock_area_view"

            android:visibility="invisible"

            android:layout_width="440dip"

            android:layout_height="440dip"

core/res/res/layout-sw600dp/keyguard_screen_unlock_landscape.xml

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ 


        <!-- Area to overlay FaceLock -->

        <RelativeLayout

            android:id="@+id/faceLockAreaView"

            android:id="@+id/face_unlock_area_view"

            android:visibility="invisible"

            android:layout_width="530dip"

            android:layout_height="530dip"

core/res/res/layout-sw600dp/keyguard_screen_unlock_portrait.xml

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 


        <!-- Area to overlay FaceLock -->

        <RelativeLayout

            android:id="@+id/faceLockAreaView"

            android:id="@+id/face_unlock_area_view"

            android:visibility="invisible"

            android:layout_width="440dip"

            android:layout_height="440dip"

core/res/res/layout/keyguard_face_unlock_view.xml

+33 −1
Original line number Diff line number Diff line
@@ -23,9 +23,41 @@ 
<com.android.internal.policy.impl.keyguard.KeyguardFaceUnlockView

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

    android:id="@+id/keyguard_face_unlock_view"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <!-- TODO -->

    <include layout="@layout/keyguard_navigation"/>



    <Space

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1" />



    <RelativeLayout

        android:id="@+id/face_unlock_area_view"

        android:layout_width="match_parent"

        android:layout_height="@dimen/face_unlock_height"

        android:background="@drawable/intro_bg"

        android:gravity="center">



        <View

            android:id="@+id/spotlightMask"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@color/facelock_spotlight_mask"

        />



        <ImageView

            android:id="@+id/cancel_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:padding="5dip"

            android:layout_alignParentTop="true"

            android:layout_alignParentEnd="true"

            android:src="@drawable/ic_facial_backup"

        />



    </RelativeLayout>



</com.android.internal.policy.impl.keyguard.KeyguardFaceUnlockView>