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

Commit 10f1137b authored by Aarthi Balachander's avatar Aarthi Balachander Committed by android-build-merger
Browse files

Merge "Move hardcoded values from autofill_save layout file to dimensions."...

Merge "Move hardcoded values from autofill_save layout file to dimensions." into qt-dev am: 90a49295
am: b9cfa1b1

Change-Id: Id37b280650a02b4a02cbfed66193ce8d2e2edb7f
parents 3b8c455e b9cfa1b1
Loading
Loading
Loading
Loading
+11 −12
Original line number Diff line number Diff line
@@ -26,17 +26,17 @@
        android:id="@+id/autofill_save"
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="32dp"
        android:paddingTop="16dp"
        android:elevation="32dp"
        android:layout_marginTop="@dimen/autofill_save_outer_top_margin"
        android:paddingTop="@dimen/autofill_save_outer_top_padding"
        android:elevation="@dimen/autofill_elevation"
        android:background="?android:attr/colorBackground"
        android:orientation="vertical">

        <LinearLayout
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:paddingStart="16dp"
            android:paddingEnd="16dp"
            android:paddingStart="@dimen/autofill_save_inner_padding"
            android:paddingEnd="@dimen/autofill_save_inner_padding"
            android:orientation="vertical">

            <LinearLayout
@@ -47,17 +47,16 @@
                <ImageView
                    android:id="@+id/autofill_save_icon"
                    android:scaleType="fitStart"
                    android:layout_width="24dp"
                    android:layout_height="24dp"/>
                    android:layout_width="@dimen/autofill_save_icon_size"
                    android:layout_height="@dimen/autofill_save_icon_size"/>

                <TextView
                    android:id="@+id/autofill_save_title"
                    android:paddingStart="8dp"
                    android:paddingStart="@dimen/autofill_save_title_start_padding"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:text="@string/autofill_save_title"
                    android:textSize="16sp"
                    android:textColor="?android:attr/textColorPrimary"
                    android:textAppearance="@style/TextAppearance.DeviceDefault.Subhead"
                    android:layout_weight="1">
                </TextView>

@@ -67,7 +66,7 @@
                android:id="@+id/autofill_save_custom_subtitle"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="4dp"
                android:layout_marginTop="@dimen/autofill_save_scroll_view_top_margin"
                android:visibility="gone"/>

        </LinearLayout>
@@ -76,7 +75,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="end"
            android:padding="16dp"
            android:padding="@dimen/autofill_save_button_bar_padding"
            android:clipToPadding="false"
            android:layout_weight="1"
            android:orientation="horizontal">
+10 −0
Original line number Diff line number Diff line
@@ -673,6 +673,16 @@
    <dimen name="autofill_dataset_picker_max_width">90%</dimen>
    <dimen name="autofill_dataset_picker_max_height">90%</dimen>

    <!-- Autofill save dialog padding -->
    <dimen name="autofill_save_outer_top_margin">32dp</dimen>
    <dimen name="autofill_save_outer_top_padding">16dp</dimen>
    <dimen name="autofill_elevation">32dp</dimen>
    <dimen name="autofill_save_inner_padding">16dp</dimen>
    <dimen name="autofill_save_icon_size">24dp</dimen>
    <dimen name="autofill_save_title_start_padding">8dp</dimen>
    <dimen name="autofill_save_scroll_view_top_margin">4dp</dimen>
    <dimen name="autofill_save_button_bar_padding">16dp</dimen>

    <!-- Max height of the the autofill save custom subtitle as a fraction of the screen width/height -->
    <dimen name="autofill_save_custom_subtitle_max_height">20%</dimen>