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

Commit a0039301 authored by Ayush Sharma's avatar Ayush Sharma Committed by Android (Google) Code Review
Browse files

Merge "For top layout use FrameLayout than GlifLayout"

parents 93a613f2 3dcf68f3

res/layout-sw600dp/confirm_lock_password.xml

+3 −5
Original line number Diff line number Diff line
@@ -14,16 +14,14 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<com.google.android.setupdesign.GlifLayout

<FrameLayout

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout="@layout/sud_glif_blank_template">

    android:layout_height="match_parent">



    <include

        layout="@layout/confirm_lock_password_base"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center_horizontal" />

</com.google.android.setupdesign.GlifLayout>
 
</FrameLayout>

res/layout-sw600dp/confirm_lock_pattern.xml

+3 −5
Original line number Diff line number Diff line
@@ -13,16 +13,14 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.google.android.setupdesign.GlifLayout

<FrameLayout

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout="@layout/sud_glif_blank_template">

    android:layout_height="match_parent">



    <include

        layout="@layout/confirm_lock_pattern_base"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center_horizontal" />

</com.google.android.setupdesign.GlifLayout>
 
</FrameLayout>