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

Commit 171ef98d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix interaction w/ work profile & last chosen"

parents b916301d 13405c55

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

+4 −2
Original line number Diff line number Diff line
@@ -340,8 +340,7 @@ public class ChooserActivity extends ResolverActivity { 
    }



    @Override

    public void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter,

            boolean alwaysUseOption) {

    public void onPrepareAdapterView(AbsListView adapterView, ResolveListAdapter adapter) {

        final ListView listView = adapterView instanceof ListView ? (ListView) adapterView : null;

        mChooserListAdapter = (ChooserListAdapter) adapter;

        if (mCallerChooserTargets != null && mCallerChooserTargets.length > 0) {
@@ -367,6 +366,9 @@ public class ChooserActivity extends ResolverActivity { 


    @Override

    public boolean shouldAutoLaunchSingleChoice(TargetInfo target) {

        // Note that this is only safe because the Intent handled by the ChooserActivity is

        // guaranteed to contain no extras unknown to the local ClassLoader. That is why this

        // method can not be replaced in the ResolverActivity whole hog.

        return getIntent().getBooleanExtra(Intent.EXTRA_AUTO_LAUNCH_SINGLE_CHOICE,

                super.shouldAutoLaunchSingleChoice(target));

    }

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

+135 −86

File changed.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java

+126 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/com/android/internal/app/ResolverActivityTest.java

+136 −2

File changed.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/com/android/internal/app/ResolverDataProvider.java

+10 −3
Original line number Diff line number Diff line
@@ -32,9 +32,16 @@ import java.util.concurrent.atomic.AtomicInteger; 
 */

class ResolverDataProvider {



    static private int USER_SOMEONE_ELSE = 10;



    static ResolverActivity.ResolvedComponentInfo createResolvedComponentInfo(int i) {

        return new ResolverActivity.ResolvedComponentInfo(createComponentName(i),

                createResolverIntent(i), createResolveInfo(i));

                createResolverIntent(i), createResolveInfo(i, UserHandle.USER_CURRENT));

    }



    static ResolverActivity.ResolvedComponentInfo createResolvedComponentInfoWithOtherId(int i) {

        return new ResolverActivity.ResolvedComponentInfo(createComponentName(i),

                createResolverIntent(i), createResolveInfo(i, USER_SOMEONE_ELSE));

    }



    static ComponentName createComponentName(int i) {
@@ -42,10 +49,10 @@ class ResolverDataProvider { 
        return new ComponentName("foo.bar." + name, name);

    }



    static ResolveInfo createResolveInfo(int i) {

    static ResolveInfo createResolveInfo(int i, int userId) {

        final ResolveInfo resolveInfo = new ResolveInfo();

        resolveInfo.activityInfo = createActivityInfo(i);

        resolveInfo.targetUserId = UserHandle.USER_CURRENT;

        resolveInfo.targetUserId = userId;

        return resolveInfo;

    }