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

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

Merge "Temporary workaround for conflict in GridLayout/LockScreen."

parents 94c9f39e 5b1acf9c

core/res/res/layout/keyguard_screen_unlock_portrait.xml

+3 −5
Original line number Diff line number Diff line
@@ -63,10 +63,8 @@ 


    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="0dip"

        android:layout_marginLeft="12dip"

        android:layout_gravity="right">



        <TextView
@@ -114,8 +112,8 @@ 


    <com.android.internal.widget.LockPatternView

        android:id="@+id/lockPattern"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_width="300dip"

        android:layout_height="300dip"

        android:layout_rowWeight="1"

        android:layout_marginTop="8dip"

        android:layout_marginRight="8dip"