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

Commit e1276bfe authored by Hakan Seyalioglu's avatar Hakan Seyalioglu
Browse files

Do the sorting for the ShareSheet asynchronously. 

This lets the screen fade out and share sheet start being displayed
before all results are sorted. Based heavily on ag/1126533. There are
two other follow ups that I'd like to do after this that aren't a part
of this change:

1) Investigating images being loaded multiple times (from original
   change)
2) Put placeholder space while the sorted images are coming in - at the
   moment there's some jank when the list of applications becomes
   visible.

Test: Unit tests for ChooserActivityTest (still would like to add tests
for ResolveInfoController and UsbResolverActivity).

Change-Id: I4c4a65fff1b0f17fc52b9bd01c3d5c59d649d119
parent 2a880082

core/java/com/android/internal/app/ChooserActivity.java

+59 −18
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import android.widget.AbsListView; 
import android.widget.BaseAdapter;

import android.widget.ListView;

import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.ResolverActivity.TargetInfo;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -93,6 +94,7 @@ public class ChooserActivity extends ResolverActivity { 
    private IntentSender mRefinementIntentSender;

    private RefinementResultReceiver mRefinementResultReceiver;

    private ChooserTarget[] mCallerChooserTargets;

    private ComponentName[] mFilteredComponentNames;



    private Intent mReferrerFillInIntent;
@@ -235,7 +237,7 @@ public class ChooserActivity extends ResolverActivity { 
                }

                names[i] = (ComponentName) pa[i];

            }

            setFilteredComponents(names);

            mFilteredComponentNames = names;

        }



        pa = intent.getParcelableArrayExtra(Intent.EXTRA_CHOOSER_TARGETS);
@@ -642,17 +644,65 @@ public class ChooserActivity extends ResolverActivity { 
        }

    }



    public class ChooserListController extends ResolverListController {

        public ChooserListController(Context context,

                PackageManager pm,

                Intent targetIntent,

                String referrerPackageName,

                int launchedFromUid) {

            super(context, pm, targetIntent, referrerPackageName, launchedFromUid);

        }



        @Override

        boolean isComponentPinned(ComponentName name) {

            return mPinnedSharedPrefs.getBoolean(name.flattenToString(), false);

        }



        @Override

        boolean isComponentFiltered(ComponentName name) {

            if (mFilteredComponentNames == null) {

                return false;

            }

            for (ComponentName filteredComponentName : mFilteredComponentNames) {

                if (name.equals(filteredComponentName)) {

                    return true;

                }

            }

            return false;

        }



        @Override

        public float getScore(DisplayResolveInfo target) {

            if (target == null) {

                return CALLER_TARGET_SCORE_BOOST;

            }

            float score = super.getScore(target);

            if (target.isPinned()) {

                score += PINNED_TARGET_SCORE_BOOST;

            }

            return score;

        }

    }



    @Override

    public ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,

            Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid,

            boolean filterLastUsed) {

        final ChooserListAdapter adapter = new ChooserListAdapter(context, payloadIntents,

                initialIntents, rList, launchedFromUid, filterLastUsed);

        if (DEBUG) Log.d(TAG, "Adapter created; querying services");

        queryTargetServices(adapter);

                initialIntents, rList, launchedFromUid, filterLastUsed, createListController());

        return adapter;

    }



    @VisibleForTesting

    protected ResolverListController createListController() {

        return new ChooserListController(

                this,

                mPm,

                getTargetIntent(),

                getReferrerPackageName(),

                mLaunchedFromUid);

    }



    final class ChooserTargetInfo implements TargetInfo {

        private final DisplayResolveInfo mSourceInfo;

        private final ResolveInfo mBackupResolveInfo;
@@ -853,10 +903,11 @@ public class ChooserActivity extends ResolverActivity { 


        public ChooserListAdapter(Context context, List<Intent> payloadIntents,

                Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid,

                boolean filterLastUsed) {

                boolean filterLastUsed, ResolverListController resolverListController) {

            // Don't send the initial intents through the shared ResolverActivity path,

            // we want to separate them into a different section.

            super(context, payloadIntents, null, rList, launchedFromUid, filterLastUsed);

            super(context, payloadIntents, null, rList, launchedFromUid, filterLastUsed,

                    resolverListController);



            if (initialIntents != null) {

                final PackageManager pm = getPackageManager();
@@ -921,18 +972,6 @@ public class ChooserActivity extends ResolverActivity { 
            return mPinnedSharedPrefs.getBoolean(name.flattenToString(), false);

        }



        @Override

        public float getScore(DisplayResolveInfo target) {

            if (target == null) {

                return CALLER_TARGET_SCORE_BOOST;

            }

            float score = super.getScore(target);

            if (target.isPinned()) {

                score += PINNED_TARGET_SCORE_BOOST;

            }

            return score;

        }



        @Override

        public View onCreateView(ViewGroup parent) {

            return mInflater.inflate(
@@ -944,6 +983,8 @@ public class ChooserActivity extends ResolverActivity { 
            if (mServiceTargets != null) {

                pruneServiceTargets();

            }

            if (DEBUG) Log.d(TAG, "List built querying services");

            queryTargetServices(this);

        }



        @Override