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

Commit e42c317a authored by Tony Huang's avatar Tony Huang
Browse files

Update info page to new UI 

1. Use CollapsingToolbarLayout to implement the mock UI.
2. Remove InspectorFragment and only use InspectorActivity.
3. Put title and showDebug value to InspectorController instead
   of put whole Bundle.
4. Upadte thunbnail background and debug info background color
   to fit theme.
5. Update InternalStorageUiTest due to delete/undo rollback,
   also make it test more robust and add @LargeTest.

Bug: 79901873
Fix: 118144933
Test: atest DocumentsUITests
Change-Id: Iedccb335b25d6e4e2b630c985eb5c7afcc902317
parent 243cf9c6

res/drawable/gradient_actionbar_background.xml

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

<!-- Copyright (C) 2018 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">

    <gradient

        android:startColor="@color/tool_bar_gradient_max"

        android:endColor="@android:color/transparent"

        android:angle="270"

        android:type="linear" >

    </gradient>

</shape>
 
 No newline at end of file

res/layout/inspector_activity.xml

+91 −14
Original line number Diff line number Diff line
@@ -14,23 +14,100 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

    android:orientation="vertical"

<androidx.coordinatorlayout.widget.CoordinatorLayout

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

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

    android:id="@+id/inspector_root"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <com.google.android.material.appbar.AppBarLayout

        android:id="@+id/appBar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:fitsSystemWindows="true"

        android:background="?android:colorPrimary">



        <com.google.android.material.appbar.CollapsingToolbarLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="?android:attr/actionBarSize"

            android:fitsSystemWindows="true"

            app:titleEnabled="false"

            app:contentScrim="?android:colorPrimary"

            app:statusBarScrim="@android:color/transparent"

            app:layout_scrollFlags="scroll|exitUntilCollapsed">



            <com.android.documentsui.inspector.HeaderView

                android:id="@+id/inspector_header_view"

                android:layout_width="match_parent"

    android:layout_height="match_parent">

                android:layout_height="@dimen/inspector_header_height"

                app:layout_collapseMode="parallax"/>



    <Toolbar

            <androidx.appcompat.widget.Toolbar

                android:id="@+id/toolbar"

        android:title="@string/inspector_title"

                android:layout_width="match_parent"

                android:layout_height="?android:attr/actionBarSize"

        android:elevation="8dp">

    </Toolbar>

                android:background="@drawable/gradient_actionbar_background"

                android:theme="?actionBarTheme"

                app:title="@string/inspector_title"

                app:layout_collapseMode="pin">

            </androidx.appcompat.widget.Toolbar>

        </com.google.android.material.appbar.CollapsingToolbarLayout>

    </com.google.android.material.appbar.AppBarLayout>



    <FrameLayout

        android:id="@+id/fragment_container"

    <androidx.core.widget.NestedScrollView

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        app:behavior_overlapTop="40dp"

        app:layout_behavior="@string/appbar_scrolling_view_behavior">



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@drawable/bottom_sheet_dialog_background"

            android:layout_marginTop="4dp"

            android:elevation="8dp"

            android:paddingBottom="5dp">



            <com.android.documentsui.inspector.DetailsView

                android:id="@+id/inspector_details_view"

                android:orientation="vertical"

                android:layout_width="match_parent"

        android:layout_height="match_parent">

    </FrameLayout>

                android:layout_height="wrap_content"/>



            <com.android.documentsui.inspector.MediaView

                android:id="@+id/inspector_media_view"

                android:orientation="vertical"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"/>



            <com.android.documentsui.inspector.actions.ActionView

                android:id="@+id/inspector_show_in_provider_view"

                android:orientation="vertical"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone"/>



            <com.android.documentsui.inspector.actions.ActionView

                android:id="@+id/inspector_app_defaults_view"

                android:orientation="vertical"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:visibility="gone"/>



            <com.android.documentsui.inspector.DebugView

                android:id="@+id/inspector_debug_view"

                android:orientation="vertical"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingTop="20dp"

                android:visibility="gone" />



        </LinearLayout>

    </androidx.core.widget.NestedScrollView>



</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/layout/inspector_fragment.xml

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

<!--

    Copyright (C) 2017 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.

-->

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

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingBottom="5dp">



        <com.android.documentsui.inspector.HeaderView

            android:id="@+id/inspector_header_view"

            android:layout_width="match_parent"

            android:paddingBottom="5dp"

            android:layout_height="@dimen/inspector_header_height" />



        <com.android.documentsui.inspector.DetailsView

            android:id="@+id/inspector_details_view"

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>



        <com.android.documentsui.inspector.MediaView

            android:id="@+id/inspector_media_view"

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>



        <com.android.documentsui.inspector.actions.ActionView

            android:id="@+id/inspector_show_in_provider_view"

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone"/>



        <com.android.documentsui.inspector.actions.ActionView

            android:id="@+id/inspector_app_defaults_view"

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone"/>



        <com.android.documentsui.inspector.DebugView

            android:id="@+id/inspector_debug_view"

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="20dp"

            android:visibility="gone" />



    </LinearLayout>

</ScrollView>

res/layout/inspector_header.xml

+2 −16
Original line number Diff line number Diff line
@@ -22,22 +22,8 @@ 
        android:id="@+id/inspector_thumbnail"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:scaleType="fitCenter"

        android:alpha="0.0"

        android:background="@android:color/white" />



    <TextView

        android:id="@+id/inspector_file_title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="5dp"

        android:paddingBottom="5dp"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:layout_gravity="center_vertical"

        android:background="@color/inspector_title_background"

        android:textIsSelectable="true"

        android:textAlignment="viewStart"

        android:layout_alignBottom="@+id/inspector_thumbnail"

        android:textAppearance="@style/InspectorHeaderTitle" />

        android:background="?attr/gridItemColor" />



</RelativeLayout>

res/layout/inspector_section_title.xml

+12 −5
Original line number Diff line number Diff line
@@ -23,15 +23,22 @@ 
    android:paddingStart="10dp"

    android:paddingEnd="10dp">



    <!--Empty view for keeping divider when title is gone-->

    <android.widget.Space

        android:layout_height="wrap_content"

        android:layout_width="wrap_content">

    </android.widget.Space >



    <TextView

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:id="@+id/inspector_header_title"

        android:paddingStart="6dp"

        android:paddingEnd="6dp"

        android:paddingTop="5dp"

        android:paddingBottom="5dp"

        android:paddingStart="16dp"

        android:paddingEnd="16dp"

        android:paddingTop="25dp"

        android:paddingBottom="25dp"

        android:layout_gravity="center_vertical"

        android:textAppearance="?attr/textAppearanceHeadline6"

        android:textAlignment="viewStart"/>

        android:textAlignment="viewStart"

        android:textIsSelectable="true"/>

</LinearLayout>
 
 No newline at end of file