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

Commit b063e7b6 authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am b3e8071d: am b1d094ba: am f080dc0c: am 7d59cf9f: Merge "allow pattern... 

am b3e8071d: am b1d094ba: am f080dc0c: am 7d59cf9f: Merge "allow pattern linear layout to manage message_area." into jb-mr1-lockscreen-dev

* commit 'b3e8071d':
  allow pattern linear layout to manage message_area.
parents 11bf8e2c b3e8071d

core/res/res/layout/keyguard_pattern_view.xml

+5 −4
Original line number Original line Diff line number Diff line
@@ -35,16 +35,17 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="match_parent">





        <include layout="@layout/keyguard_message_area"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



        <LinearLayout

        <LinearLayout

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:orientation="vertical"

            android:orientation="vertical"

            android:layout_gravity="center">

            android:layout_gravity="center">





            <include layout="@layout/keyguard_message_area"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

               />



          <FrameLayout

          <FrameLayout

             android:id="@+id/keyguard_bouncer_frame"

             android:id="@+id/keyguard_bouncer_frame"

             android:background="@*android:drawable/kg_bouncer_bg_white"

             android:background="@*android:drawable/kg_bouncer_bg_white"