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

Commit ec8ad87f authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "For top layout use FrameLayout than GlifLayout" into tm-qpr-dev am: 8f839acd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20979439



Change-Id: I61f851961501fb97fb63a804e157f370ad05726b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4dbe956a 8f839acd

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>