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

Commit 1e6e422c authored by Tony Huang's avatar Tony Huang
Browse files

Add account info on apps row 

Bug: 143730616
Test: manual
Test: atest DocumentsUIGoogleTests
Change-Id: I2b20446d8ca54426aef10e78ca934d906cd24f2a
parent 90e57791

res/layout/apps_item.xml

+11 −0
Original line number Diff line number Diff line
@@ -45,6 +45,17 @@ 
        android:ellipsize="end"

        android:gravity="center"/>



    <TextView

        android:id="@+id/summary"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/apps_row_item_text_margin_horizontal"

        android:layout_marginEnd="@dimen/apps_row_item_text_margin_horizontal"

        android:textAppearance="@style/AppsItemSubText"

        android:maxLines="1"

        android:ellipsize="end"

        android:gravity="center"/>



    <ImageView

        android:id="@+id/exit_icon"

        android:layout_width="@dimen/apps_row_exit_icon_size"

res/values/styles_text.xml

+6 −1
Original line number Diff line number Diff line
@@ -36,11 +36,16 @@ 
    </style>



    <style name="AppsItemText">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textSize">12sp</item>

        <item name="fontFamily">@string/config_fontFamily</item>

    </style>



    <style name="AppsItemSubText">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:textSize">11sp</item>

    </style>



    <style name="AutoCompleteText" parent="@style/TextAppearance.AppCompat.Medium">

        <item name="fontFamily">@string/config_fontFamily</item>

    </style>

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

+11 −1
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 
package com.android.documentsui.dirlist;



import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.graphics.drawable.Drawable;



import androidx.annotation.Nullable;



import com.android.documentsui.ActionHandler;

import com.android.documentsui.base.RootInfo;

import com.android.documentsui.sidebar.AppItem;
@@ -35,10 +36,12 @@ import com.android.documentsui.sidebar.RootItem; 
public abstract class AppsRowItemData {



    private final String mTitle;

    private final @Nullable String mSummary;

    protected final ActionHandler mActionHandler;



    public AppsRowItemData(Item item, ActionHandler actionHandler) {

        mTitle = item.title;

        mSummary = item.getSummary();

        mActionHandler = actionHandler;

    }
@@ -46,6 +49,13 @@ public abstract class AppsRowItemData { 
        return mTitle;

    }



    /**

     * Get the summary from {@link Item}.

     */

    public final @Nullable String getSummary() {

        return mSummary;

    }



    protected abstract Drawable getIconDrawable(Context context);

    protected abstract void onClicked();

    protected abstract boolean showExitIcon();

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

+3 −0
Original line number Diff line number Diff line
@@ -90,10 +90,13 @@ public class AppsRowManager { 
    private void bindView(View view, AppsRowItemData data) {

        final ImageView app_icon = view.findViewById(R.id.app_icon);

        final TextView title = view.findViewById(android.R.id.title);

        final TextView summary = view.findViewById(R.id.summary);

        final ImageView exit_icon = view.findViewById(R.id.exit_icon);



        app_icon.setImageDrawable(data.getIconDrawable(view.getContext()));

        title.setText(data.getTitle());

        summary.setText(data.getSummary());

        summary.setVisibility(data.getSummary() != null ? View.VISIBLE : View.GONE);

        exit_icon.setVisibility(data.showExitIcon() ? View.VISIBLE : View.GONE);

        view.setOnClickListener(v -> data.onClicked());

    }

src/com/android/documentsui/sidebar/Item.java

+10 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.documentsui.sidebar;



import androidx.annotation.LayoutRes;

import android.view.DragEvent;

import android.view.LayoutInflater;

import android.view.Menu;
@@ -24,6 +23,9 @@ import android.view.MenuInflater; 
import android.view.View;

import android.view.ViewGroup;



import androidx.annotation.LayoutRes;

import androidx.annotation.Nullable;



import com.android.documentsui.MenuManager;

import com.android.documentsui.R;
@@ -64,6 +66,13 @@ public abstract class Item { 
        return "";

    }



    /**

     * Get the root or app summary such as account information.

     */

    public @Nullable String getSummary() {

        return null;

    }



    boolean isDropTarget() {

        return isRoot();

    }