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

Commit 48732303 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki Committed by Android (Google) Code Review
Browse files

Merge "Work challenge background: Fix top padding" into nyc-dev

parents c35b08b4 af700ec6

res/layout-sw600dp/confirm_lock_password.xml

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
  -->

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="48dp">

    android:layout_height="match_parent">



    <include layout="@layout/confirm_lock_password_base"

        android:layout_width="match_parent"

res/layout/confirm_lock_password_base.xml

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
        android:orientation="vertical"

        android:layout_width="@dimen/confirm_credentials_layout_width"

        android:layout_height="match_parent"

        android:layout_gravity="top|center_horizontal">

        android:layout_gravity="top|center_horizontal"

        android:paddingTop="@dimen/confirm_credentials_top_padding">



        <TextView

            style="@android:style/TextAppearance.Material.Headline"

res/layout/confirm_lock_pattern_base.xml

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
        android:orientation="vertical"

        android:layout_width="@dimen/confirm_credentials_layout_width"

        android:layout_height="match_parent"

        android:layout_gravity="top|center_horizontal">

        android:layout_gravity="top|center_horizontal"

        android:paddingTop="@dimen/confirm_credentials_top_padding">



        <TextView

            style="@android:style/TextAppearance.Material.Headline"

res/values-sw600dp/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -74,5 +74,6 @@ 


    <dimen name="confirm_credentials_security_method_margin">72dp</dimen>

    <dimen name="confirm_credentials_layout_width">328dp</dimen>

    <dimen name="confirm_credentials_top_padding">48dp</dimen>

    <dimen name="fab_margin">24dp</dimen>

</resources>

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ 


    <dimen name="confirm_credentials_security_method_margin">48dp</dimen>

    <dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen>

    <dimen name="confirm_credentials_top_padding">0dp</dimen>

    <dimen name="fab_size">56dp</dimen>

    <dimen name="fab_margin">16dp</dimen>

    <dimen name="fab_elevation">12dp</dimen>