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

Commit 7df9f756 authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Finish mini-resolver after user action." into tm-dev am: 831370bf am:...

Merge "Finish mini-resolver after user action." into tm-dev am: 831370bf am: 68bdb03d am: 01ca540e am: f4075745

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18838611



Change-Id: I9ebfc3eeaf7b12071b18c5c3c7098052eb31c096
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ed06e13 f4075745
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -1501,7 +1501,10 @@ public class ResolverActivity extends Activity implements
                        : R.string.miniresolver_use_personal_browser);

        findViewById(R.id.use_same_profile_browser).setOnClickListener(
                v -> safelyStartActivity(sameProfileResolveInfo));
                v -> {
                    safelyStartActivity(sameProfileResolveInfo);
                    finish();
                });

        findViewById(R.id.button_open).setOnClickListener(v -> {
            Intent intent = otherProfileResolveInfo.getResolvedIntent();
@@ -1510,6 +1513,7 @@ public class ResolverActivity extends Activity implements
            }
            safelyStartActivityAsUser(otherProfileResolveInfo,
                    inactiveAdapter.mResolverListController.getUserHandle());
            finish();
        });
    }