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

Commit 87b24705 authored by Wenbo Jie's avatar Wenbo Jie
Browse files

[DocsUI M3] Split the main container into 3 sections 

* Split the main container section (right part) into
  3 sub sections: app bar and search chips, file list/grid,
  file path bar (breadcrumb), add gap between the 3
  sub sections and add corner radius. Note: this doesn't
  impact the compact layout.
* Remove the additional bottom padding for both nav
  tree and directory list in full screen mode.
* Removes the bottom border for table header as per spec.
* Explicitly specify background color for breadcrumb in
  compact screen to avoid overlap between the file list
  and the breadcrumb area.

Check the attached bug for demo video.

Bug: 387869597
Test: m DocumentsUIGoogle && manual inspection
Flag: com.android.documentsui.flags.use_material3
Change-Id: Ib7f7e8837d7486a0e902604386f802322e557ab0
parent 9390e458

res/flag(com.android.documentsui.flags.use_material3)/drawable/main_container_bottom_section_background.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:shape="rectangle">

    <solid android:color="?attr/colorSurfaceBright" />

    <corners

        android:topLeftRadius="@dimen/main_container_corner_radius_small"

        android:topRightRadius="@dimen/main_container_corner_radius_small"

        android:bottomLeftRadius="@dimen/main_container_corner_radius_large"

        android:bottomRightRadius="@dimen/main_container_corner_radius_large" />

</shape>
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/drawable/main_container_background.xml→res/flag(com.android.documentsui.flags.use_material3)/drawable/main_container_middle_section_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <solid android:color="?attr/colorSurfaceBright" />

    <corners android:radius="16dp" />

    <corners android:radius="@dimen/main_container_corner_radius_small" />

</shape>
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/drawable/main_container_top_section_background.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

    android:shape="rectangle">

    <solid android:color="?attr/colorSurfaceBright" />

    <corners

        android:topLeftRadius="@dimen/main_container_corner_radius_large"

        android:topRightRadius="@dimen/main_container_corner_radius_large"

        android:bottomLeftRadius="@dimen/main_container_corner_radius_small"

        android:bottomRightRadius="@dimen/main_container_corner_radius_small" />

</shape>
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/drawable/sort_widget_background.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
    limitations under the License.

  -->



<!-- TODO(b/379776735): remove this file after M3 uplift -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:top="-1dp"

res/flag(com.android.documentsui.flags.use_material3)/layout-w900dp/column_headers.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="@dimen/doc_header_height"

    android:background="@drawable/sort_widget_background"

    android:visibility="gone">



    <LinearLayout