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

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

Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev

parents 3f8794df 838906b1
Loading
Loading
Loading
Loading
+19.5 KiB
Loading image diff...
+1.22 MiB
Loading image diff...
+6.23 KiB
Loading image diff...
+516 B
Loading image diff...
+38 −15
Original line number Diff line number Diff line
@@ -27,22 +27,45 @@
    android:gravity="center_horizontal"
    android:orientation="vertical">

    <include layout="@layout/keyguard_widget_region"
    <include layout="@layout/keyguard_widget_pager"
        android:layout_width="match_parent"
        android:layout_height="153dp" />
        android:layout_height="match_parent" />

    <SlidingDrawer
        android:id="@+id/drawer"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"

        android:handle="@+id/handle"
        android:content="@+id/keyguard_security_container">

    <ImageView
        android:id="@id/handle"
        android:layout_width="88dip"
        android:layout_height="44dip" 
        android:src="@drawable/security_handle" />

    <com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer
        android:id="@id/keyguard_security_container"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:gravity="bottom|center_horizontal"
        android:background="@drawable/security_frame">
        <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper
            android:id="@+id/view_flipper"
        android:layout_width="match_parent"
        android:layout_height="0dip"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:clipChildren="false"
            android:clipToPadding="false"
        android:layout_weight="1"
            android:paddingLeft="@dimen/keyguard_security_view_margin"
            android:paddingTop="@dimen/keyguard_security_view_margin"
            android:paddingRight="@dimen/keyguard_security_view_margin"
            android:paddingBottom="@dimen/keyguard_security_view_margin"
            android:gravity="center">
        </com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper>
    </com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer>

 </SlidingDrawer>

</com.android.internal.policy.impl.keyguard.KeyguardHostView>
Loading