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

Commit 918931f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] Uplift picker/save fragment spacing" into main

parents 8725a290 1df9e561

res/flag(com.android.documentsui.flags.use_material3)/layout-w600dp-h600dp/fragment_save_cancel_button.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
    app:cornerRadius="@dimen/button_corner_radius"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginBottom="@dimen/picker_saver_button_gap"

    android:layout_marginStart="@dimen/picker_saver_button_gap"

    android:layout_marginTop="@dimen/picker_saver_button_gap"

    android:layout_marginEnd="@dimen/picker_saver_button_gap"

    android:text="@android:string/cancel"/>

res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_pick_directory.xml

+8 −8
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="@dimen/picker_saver_container_padding_top"

    android:paddingBottom="@dimen/picker_saver_container_padding_bottom">

    android:layout_height="wrap_content">



    <LinearLayout

        android:layout_width="match_parent"
@@ -28,8 +26,8 @@ 
        android:baselineAligned="false"

        android:background="?attr/colorSurfaceContainer"

        android:gravity="center_vertical|end"

        android:paddingStart="@dimen/bottom_bar_padding"

        android:paddingEnd="@dimen/bottom_bar_padding"

        android:paddingStart="@dimen/picker_saver_padding_start"

        android:paddingEnd="@dimen/picker_saver_padding_end"

        android:paddingTop="@dimen/picker_saver_padding_top"

        android:paddingBottom="@dimen/picker_saver_padding_bottom">
@@ -39,7 +37,8 @@ 
            app:cornerRadius="@dimen/button_corner_radius"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/picker_saver_button_gap"

            android:layout_marginBottom="@dimen/picker_saver_button_gap"

            android:layout_marginTop="@dimen/picker_saver_button_gap"

            android:layout_marginEnd="@dimen/picker_saver_button_gap"

            android:text="@android:string/cancel" />
@@ -49,8 +48,9 @@ 
            app:cornerRadius="@dimen/button_corner_radius"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="@dimen/picker_saver_button_gap"

            android:layout_marginEnd="@dimen/picker_saver_button_gap" />

            android:layout_marginBottom="@dimen/picker_saver_button_gap"

            android:layout_marginTop="@dimen/picker_saver_button_gap"

            android:layout_marginStart="@dimen/picker_saver_button_gap"/>



    </LinearLayout>

res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save.xml

+46 −49
Original line number Diff line number Diff line
@@ -14,31 +14,28 @@ 
     limitations under the License.

-->



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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="@dimen/picker_saver_container_padding_top"

    android:paddingBottom="@dimen/picker_saver_container_padding_bottom">



<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="@dimen/picker_saver_padding_start"

    android:paddingEnd="@dimen/picker_saver_padding_end"

    android:paddingTop="@dimen/picker_saver_padding_top"

    android:paddingBottom="@dimen/picker_saver_padding_bottom"

        android:paddingEnd="@dimen/bottom_bar_padding"

    android:orientation="horizontal"

    android:baselineAligned="false"

        android:gravity="center_vertical|end"

        android:paddingStart="@dimen/list_item_padding">

    android:gravity="center_vertical|end">



    <com.google.android.material.textfield.TextInputLayout

        android:id="@+id/title_wrapper"

        style="?attr/textInputFilledStyle"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

            android:layout_weight="1"

        android:layout_marginBottom="@dimen/picker_saver_button_gap"

        android:layout_marginEnd="@dimen/picker_saver_button_gap"

        android:layout_marginTop="@dimen/picker_saver_button_gap"

        android:layout_weight="1"

        android:hint="@string/file_name_hint">

        <com.google.android.material.textfield.TextInputEditText

            android:id="@android:id/title"
@@ -56,8 +53,9 @@ 
        app:cornerRadius="@dimen/button_corner_radius"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="@dimen/picker_saver_button_gap"

        android:layout_marginStart="@dimen/picker_saver_button_gap"

            android:layout_marginEnd="@dimen/picker_saver_button_gap"

        android:layout_marginTop="@dimen/picker_saver_button_gap"

        android:text="@string/menu_save" />



    <com.google.android.material.progressindicator.CircularProgressIndicator
@@ -65,11 +63,10 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_marginStart="@dimen/saver_progress_start_margin"

        android:visibility="gone"

        android:indeterminate="true"

        android:padding="8dp"

        app:trackColor="?attr/colorSecondaryContainer" />



</LinearLayout>
 
 No newline at end of file
 


</LinearLayout>

res/flag(com.android.documentsui.flags.use_material3)/layout/fragment_save_cancel_button.xml

+2 −0
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 
    app:cornerRadius="@dimen/button_corner_radius"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginBottom="@dimen/picker_saver_button_gap"

    android:layout_marginStart="4dp"

    android:layout_marginTop="@dimen/picker_saver_button_gap"

    android:layout_marginEnd="4dp"

    android:visibility="gone"

    android:text="@android:string/cancel"/>
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/values-w600dp-h600dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ 
    <!-- list_container_padding + list_item_padding_end -->

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



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

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

</resources>