diff options
| author | 2023-05-12 08:51:59 +0000 | |
|---|---|---|
| committer | 2023-05-12 08:51:59 +0000 | |
| commit | 2bf2724e63a34540f0d3f802c984c995cd7cb746 (patch) | |
| tree | 3b7eed404e625a8e83885e9d56ffdd3752a74241 /java/src | |
| parent | f12b3cec61ea6869236f60541d98db5dd7456299 (diff) | |
| parent | 393d7edf82a7b4b9ec02fd87b53fe61fada0005f (diff) | |
Merge "Remove auto-launching for single target, multiple tabs" into udc-dev am: 393d7edf82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22958322
Change-Id: I745eb0947c1064c94328f3be64999bead139a985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/ResolverActivity.java | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/java/src/com/android/intentresolver/ResolverActivity.java b/java/src/com/android/intentresolver/ResolverActivity.java index ced7bf58..5205f9b6 100644 --- a/java/src/com/android/intentresolver/ResolverActivity.java +++ b/java/src/com/android/intentresolver/ResolverActivity.java @@ -1864,8 +1864,10 @@ public class ResolverActivity extends FragmentActivity implements } else if (numberOfProfiles == 2 && mMultiProfilePagerAdapter.getActiveListAdapter().isTabLoaded() && mMultiProfilePagerAdapter.getInactiveListAdapter().isTabLoaded() - && (maybeAutolaunchIfNoAppsOnInactiveTab() - || maybeAutolaunchIfCrossProfileSupported())) { + && maybeAutolaunchIfCrossProfileSupported()) { + // TODO(b/280988288): If the ChooserActivity is shown we should consider showing the + // correct intent-picker UIs (e.g., mini-resolver) if it was launched without + // ACTION_SEND. return true; } return false; @@ -1892,23 +1894,6 @@ public class ResolverActivity extends FragmentActivity implements return false; } - private boolean maybeAutolaunchIfNoAppsOnInactiveTab() { - int count = mMultiProfilePagerAdapter.getActiveListAdapter().getUnfilteredCount(); - if (count != 1) { - return false; - } - ResolverListAdapter inactiveListAdapter = - mMultiProfilePagerAdapter.getInactiveListAdapter(); - if (inactiveListAdapter.getUnfilteredCount() != 0) { - return false; - } - TargetInfo target = mMultiProfilePagerAdapter.getActiveListAdapter() - .targetInfoForPosition(0, false); - safelyStartActivity(target); - finish(); - return true; - } - /** * When we have a personal and a work profile, we auto launch in the following scenario: * - There is 1 resolved target on each profile |