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

Commit 97cb71e9 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Changes on Settings UI for a better user experience" 

am: 7737b641

Change-Id: I591b6eac611109bd903c99f79ecd63d37ca59511
parents 2e2e1e24 7737b641

res/layout/master_clear.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
            android:id="@+id/master_clear_scrollview"

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_marginStart="@dimen/preference_no_icon_padding_start"

            android:layout_marginEnd="12dp"

            android:layout_marginStart="@dimen/reset_master_clear_margin_start"

            android:layout_marginEnd="@dimen/reset_master_clear_margin_end"

            android:layout_marginTop="12dp"

            android:layout_weight="1">

        <LinearLayout

res/layout/reset_network.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_marginStart="@dimen/preference_no_icon_padding_start"

        android:layout_marginEnd="12dp"

        android:layout_marginStart="@dimen/reset_network_margin_start"

        android:layout_marginEnd="@dimen/reset_network_margin_end"

        android:layout_marginTop="12dp"

        android:layout_weight="1">

res/layout/screen_pinning_instructions.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
        android:paddingTop="@dimen/screen_pinning_textview_padding"

        android:text="@string/screen_pinning_description"

        android:textAppearance="@style/TextAppearance.Medium"

        android:paddingStart="@dimen/screen_margin_sides"

        android:paddingEnd="@dimen/screen_margin_sides"

        android:paddingStart="@dimen/screen_pinning_padding_start"

        android:paddingEnd="@dimen/screen_pinning_padding_end"

        />



</ScrollView>

res/values-sw600dp-land/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -31,4 +31,8 @@ 


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

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



    <!-- Padding for screen pinning -->

    <dimen name="screen_pinning_padding_start">128dp</dimen>

    <dimen name="screen_pinning_padding_end">128dp</dimen>

</resources>

res/values-sw600dp/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -72,4 +72,8 @@ 
    <dimen name="confirm_credentials_top_padding">48dp</dimen>

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

    <dimen name="confirm_credentials_top_margin">64dp</dimen>



    <!-- Padding for screen pinning -->

    <dimen name="screen_pinning_padding_start">40dp</dimen>

    <dimen name="screen_pinning_padding_end">40dp</dimen>

</resources>