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

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

Merge "Allow pattern to start from outside pattern view" into jb-mr1-dev

parents 5bf7800d 5737534a

core/res/res/layout-land/keyguard_host_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
    </com.android.internal.policy.impl.keyguard.KeyguardWidgetPager>





    <ViewFlipper

    <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper

        android:id="@+id/view_flipper"

        android:layout_width="0dip"

        android:layout_height="match_parent"
@@ -48,6 +48,6 @@ 
        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

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



    </ViewFlipper>

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



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

core/res/res/layout-port/keyguard_host_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    android:gravity="center_horizontal"

    android:clipChildren="false">



    <ViewFlipper

    <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper

        android:id="@+id/view_flipper"

        android:layout_height="match_parent"

        android:gravity="center">
@@ -36,7 +36,7 @@ 
        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

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



    </ViewFlipper>

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



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

core/res/res/layout-sw600dp-land/keyguard_host_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
        android:layout_weight="1"

        android:gravity="center">



        <ViewFlipper

        <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper

            android:id="@+id/view_flipper"

            android:layout_width="@dimen/kg_security_view_width"

            android:layout_height="match_parent"
@@ -55,7 +55,7 @@ 
            <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

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



        </ViewFlipper>

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



    </FrameLayout>

core/res/res/layout-sw600dp-port/keyguard_host_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


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



    <ViewFlipper

    <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper

        android:id="@+id/view_flipper"

        android:layout_width="@dimen/kg_security_view_width"

        android:layout_height="0dip"
@@ -50,7 +50,7 @@ 
        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

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



    </ViewFlipper>

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



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

core/res/res/layout/keyguard_pattern_view.xml

+28 −34
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 
<com.android.internal.policy.impl.keyguard.KeyguardPatternView

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

    android:id="@+id/keyguard_pattern_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <GridLayout

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -59,6 +55,4 @@ 
        android:layout_gravity="center_horizontal"

     />



    </GridLayout>



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