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

Commit 74ded6e5 authored by Tony Huang's avatar Tony Huang
Browse files

Update UI/UX for selecting images on recent 

1. Add photoPicking state which set to true when mime type is image.
2. Add new grid mode holder for photoPicking state.
3. Only show images files and folders on photoPicking state.

Bug: 112470012
Test: manual
Test: atest DocumentsUITests
Change-Id: Ibc06c7b148a36bf5ba346dcdade58fe455888aa6
parent 9c046249

res/drawable/item_doc_grid_border.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,5 +19,4 @@ 
    <stroke

        android:width="2dp"

        android:color="@color/item_doc_grid_border"/>

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

</shape>

res/drawable/item_doc_grid_border_rounded.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"

       android:shape="rectangle">

    <stroke

        android:width="2dp"

        android:color="@color/item_doc_grid_border"/>

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

</shape>

res/layout/item_dir_grid.xml

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
        <View

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@drawable/item_doc_grid_border"

            android:background="@drawable/item_doc_grid_border_rounded"

            android:contentDescription="@null"

            android:duplicateParentState="true"/>

res/layout/item_doc_grid.xml

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ 
                android:layout_alignLeft="@id/thumbnail"

                android:layout_alignRight="@id/thumbnail"

                android:contentDescription="@null"

                android:background="@drawable/item_doc_grid_border"

                android:background="@drawable/item_doc_grid_border_rounded"

                android:duplicateParentState="true"/>



        </RelativeLayout>

res/layout/item_photo_grid.xml

0 → 100644
+125 −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.

-->



<!-- FYI: This layout has an extra top level container view that was previously used

     to allow for the insertion of debug info. The debug info is now gone, but the

     container remains because there is a high likelihood of UI regression relating

     to focus and selection states, some of which are specific to keyboard

     when touch mode is not enable. So, if you, heroic engineer of the future,

     decide to rip these out, please be sure to check out focus and keyboards. -->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:layout_margin="4dp"

    android:background="@drawable/grid_item_background"

    android:elevation="@dimen/grid_item_elevation"

    android:focusable="true">



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:duplicateParentState="true">



        <!-- Main item thumbnail. Comprised of two overlapping images, the

             visibility of which is controlled by code in

             DirectoryFragment.java. -->



        <FrameLayout

            android:id="@+id/thumbnail"

            android:layout_width="match_parent"

            android:layout_height="wrap_content">



            <com.android.documentsui.GridItemThumbnail

                android:id="@+id/icon_thumb"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:scaleType="centerCrop"

                android:contentDescription="@null"

                android:tint="?attr/gridItemTint"

                android:tintMode="src_over"/>



            <com.android.documentsui.GridItemThumbnail

                android:id="@+id/icon_mime_lg"

                android:layout_width="@dimen/icon_size"

                android:layout_height="@dimen/icon_size"

                android:layout_gravity="center"

                android:scaleType="fitCenter"

                android:contentDescription="@null"/>



        </FrameLayout>



        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            android:layout_alignParentStart="true"

            android:pointerIcon="hand"

            android:paddingTop="2dp"

            android:paddingBottom="2dp"

            android:paddingStart="2dp"

            android:paddingEnd="2dp">



            <ImageView

                android:id="@+id/icon_check"

                android:src="@drawable/ic_check_circle"

                android:alpha="0"

                android:layout_width="@dimen/check_icon_size"

                android:layout_height="@dimen/check_icon_size"

                android:layout_gravity="center"

                android:scaleType="fitCenter"

                android:contentDescription="@null"/>



        </FrameLayout>



        <FrameLayout

            android:id="@+id/preview_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_margin="4dp"

            android:layout_alignParentTop="true"

            android:layout_alignParentEnd="true"

            android:background="@drawable/circle_button_background"

            android:pointerIcon="hand"

            android:focusable="true"

            android:clickable="true">



            <ImageView

                android:layout_width="@dimen/zoom_icon_size"

                android:layout_height="@dimen/zoom_icon_size"

                android:layout_margin="2dp"

                android:layout_gravity="center"

                android:scaleType="fitCenter"

                android:src="@drawable/ic_zoom_out"/>



        </FrameLayout>



        <!-- An overlay that draws the item border when it is focused. -->

        <View

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignBottom="@id/thumbnail"

            android:layout_alignTop="@id/thumbnail"

            android:layout_alignLeft="@id/thumbnail"

            android:layout_alignRight="@id/thumbnail"

            android:contentDescription="@null"

            android:background="@drawable/item_doc_grid_border"

            android:duplicateParentState="true"/>



    </RelativeLayout>



</LinearLayout>