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

Commit d70a09d6 authored by Diksha Gohlyan's avatar Diksha Gohlyan
Browse files

Align the metadata for files acoording to mocks 

Test: atest DocumentsUIGoogleTests
Bug: 168244704

Change-Id: I39fe18ed7a9f07b407b520123c6e5f16ce7b9f53
parent 964f189f

res/layout/item_doc_list.xml

+123 −131
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?><!--

<!--

     Copyright (C) 2013 The Android Open Source Project

     Copyright (C) 2013 The Android Open Source Project





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

     Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,12 @@ 
     limitations under the License.

     limitations under the License.

-->

-->





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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



  <LinearLayout

  <LinearLayout

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

      android:id="@+id/item_root"

      android:id="@+id/item_root"

      android:layout_width="match_parent"

      android:layout_width="match_parent"

      android:layout_height="wrap_content"

      android:layout_height="wrap_content"
@@ -24,7 +27,6 @@ 
      android:focusable="true"

      android:focusable="true"

      android:orientation="horizontal">

      android:orientation="horizontal">







    <LinearLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"
@@ -67,6 +69,7 @@ 
            android:contentDescription="@null"

            android:contentDescription="@null"

            android:scaleType="fitCenter"

            android:scaleType="fitCenter"

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

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



      </FrameLayout>

      </FrameLayout>





      <LinearLayout

      <LinearLayout
@@ -99,6 +102,7 @@ 
              android:singleLine="true"

              android:singleLine="true"

              android:textAlignment="viewStart"

              android:textAlignment="viewStart"

              android:textAppearance="?android:attr/textAppearanceListItem" />

              android:textAppearance="?android:attr/textAppearanceListItem" />



        </LinearLayout>

        </LinearLayout>





        <LinearLayout

        <LinearLayout
@@ -106,41 +110,20 @@ 
            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:baselineAligned="false"

            android:baselineAligned="false"

            android:layout_marginTop="4dp"

            android:gravity="center_vertical"

            android:gravity="center_vertical"

            android:orientation="horizontal">

            android:orientation="horizontal">





          <TextView

          <TextView

                    android:id="@+id/date"

              android:id="@+id/metadata"

                    android:layout_width="0dp"

              android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_weight="0.4"

                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

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



                <TextView

                    android:id="@+id/size"

                    android:layout_width="0dp"

              android:layout_height="wrap_content"

              android:layout_height="wrap_content"

                    android:layout_marginStart="8dp"

                    android:layout_weight="0.3"

              android:ellipsize="end"

              android:ellipsize="end"

              android:singleLine="true"

              android:singleLine="true"

                    android:textAlignment="viewStart"

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

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





                <TextView

                    android:id="@+id/file_type"

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="8dp"

                    android:layout_weight="0.3"

                    android:ellipsize="end"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

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

        </LinearLayout>

        </LinearLayout>



      </LinearLayout>

      </LinearLayout>





      <FrameLayout

      <FrameLayout
@@ -164,3 +147,12 @@ 
    </LinearLayout>

    </LinearLayout>





  </LinearLayout>

  </LinearLayout>



  <View

      android:layout_width="match_parent"

      android:layout_height="1dp"

      android:layout_marginStart="72dp"

      android:layout_marginEnd="8dp"

      android:background="?android:strokeColor" />



</LinearLayout>
 
 No newline at end of file

src/com/android/documentsui/dirlist/ListDocumentHolder.java

+9 −15
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.documentsui.base.DocumentInfo.getCursorString; 
import android.content.Context;

import android.content.Context;

import android.database.Cursor;

import android.database.Cursor;

import android.graphics.Rect;

import android.graphics.Rect;

import android.text.TextUtils;

import android.text.format.Formatter;

import android.text.format.Formatter;

import android.view.MotionEvent;

import android.view.MotionEvent;

import android.view.View;

import android.view.View;
@@ -41,15 +42,14 @@ import com.android.documentsui.base.UserId; 
import com.android.documentsui.roots.RootCursorWrapper;

import com.android.documentsui.roots.RootCursorWrapper;

import com.android.documentsui.ui.Views;

import com.android.documentsui.ui.Views;





import java.util.ArrayList;

import java.util.function.Function;

import java.util.function.Function;





final class ListDocumentHolder extends DocumentHolder {

final class ListDocumentHolder extends DocumentHolder {





    private final TextView mTitle;

    private final TextView mTitle;

    private final @Nullable LinearLayout mDetails;  // Container of date/size/summary

    private final @Nullable LinearLayout mDetails;  // Container of date/size/summary

    private final TextView mDate;

    private final TextView mMetadataView;

    private final TextView mSize;

    private final TextView mType;

    private final ImageView mIconMime;

    private final ImageView mIconMime;

    private final ImageView mIconThumb;

    private final ImageView mIconThumb;

    private final ImageView mIconCheck;

    private final ImageView mIconCheck;
@@ -72,9 +72,7 @@ final class ListDocumentHolder extends DocumentHolder { 
        mIconCheck = (ImageView) itemView.findViewById(R.id.icon_check);

        mIconCheck = (ImageView) itemView.findViewById(R.id.icon_check);

        mIconBriefcase = (ImageView) itemView.findViewById(R.id.icon_briefcase);

        mIconBriefcase = (ImageView) itemView.findViewById(R.id.icon_briefcase);

        mTitle = (TextView) itemView.findViewById(android.R.id.title);

        mTitle = (TextView) itemView.findViewById(android.R.id.title);

        mSize = (TextView) itemView.findViewById(R.id.size);

        mMetadataView = (TextView) itemView.findViewById(R.id.metadata);

        mDate = (TextView) itemView.findViewById(R.id.date);

        mType = (TextView) itemView.findViewById(R.id.file_type);

        // Warning: mDetails view doesn't exists in layout-sw720dp-land layout

        // Warning: mDetails view doesn't exists in layout-sw720dp-land layout

        mDetails = (LinearLayout) itemView.findViewById(R.id.line2);

        mDetails = (LinearLayout) itemView.findViewById(R.id.line2);

        mPreviewIcon = itemView.findViewById(R.id.preview_icon);

        mPreviewIcon = itemView.findViewById(R.id.preview_icon);
@@ -214,22 +212,18 @@ final class ListDocumentHolder extends DocumentHolder { 
            // Note, we don't show any details for any directory...ever.

            // Note, we don't show any details for any directory...ever.

            hasDetails = false;

            hasDetails = false;

        } else {

        } else {

            ArrayList<String> metadataList = new ArrayList<>();

            if (mDoc.lastModified > 0) {

            if (mDoc.lastModified > 0) {

                hasDetails = true;

                hasDetails = true;

                mDate.setText(Shared.formatTime(mContext, mDoc.lastModified));

                metadataList.add(Shared.formatTime(mContext, mDoc.lastModified));

            } else {

                mDate.setText(null);

            }

            }



            if (mDoc.size > -1) {

            if (mDoc.size > -1) {

                hasDetails = true;

                hasDetails = true;

                mSize.setVisibility(View.VISIBLE);

                metadataList.add(Formatter.formatFileSize(mContext, mDoc.size));

                mSize.setText(Formatter.formatFileSize(mContext, mDoc.size));

            } else {

                mSize.setVisibility(View.INVISIBLE);

            }

            }





            mType.setText(mFileTypeLookup.lookup(mDoc.mimeType));

            metadataList.add(mFileTypeLookup.lookup(mDoc.mimeType));

            mMetadataView.setText(TextUtils.join(", ", metadataList));

        }

        }





        // mDetails view doesn't exists in layout-sw720dp-land layout

        // mDetails view doesn't exists in layout-sw720dp-land layout