Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Be more consistent with Q when the tabs feature flag is disabled."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-18 22:59:16 +00:00
committed by Android (Google) Code Review
parent af30b28ef2 db0c1f18c9
commit 7ae03eb898
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -1304,8 +1304,11 @@ public class ResolverActivity extends Activity implements
+ "cannot be null.");
}
// We partially rebuild the inactive adapter to determine if we should auto launch
boolean rebuildActiveCompleted = mMultiProfilePagerAdapter.rebuildActiveTab(true);
boolean rebuildInactiveCompleted = mMultiProfilePagerAdapter.rebuildInactiveTab(false);
boolean rebuildCompleted = mMultiProfilePagerAdapter.rebuildActiveTab(true);
if (hasWorkProfile() && ENABLE_TABBED_VIEW) {
boolean rebuildInactiveCompleted = mMultiProfilePagerAdapter.rebuildInactiveTab(false);
rebuildCompleted = rebuildCompleted && rebuildInactiveCompleted;
}
if (useLayoutWithDefault()) {
mLayoutId = R.layout.resolver_list_with_default;
@@ -1314,7 +1317,7 @@ public class ResolverActivity extends Activity implements
}
setContentView(mLayoutId);
mMultiProfilePagerAdapter.setupViewPager(findViewById(R.id.profile_pager));
return postRebuildList(rebuildActiveCompleted && rebuildInactiveCompleted);
return postRebuildList(rebuildCompleted);
}
/**
@@ -1378,6 +1381,10 @@ public class ResolverActivity extends Activity implements
return false;
}
if (mMultiProfilePagerAdapter.getActiveListAdapter().getOtherProfile() != null) {
return false;
}
// Only one target, so we're a candidate to auto-launch!
final TargetInfo target = mMultiProfilePagerAdapter.getActiveListAdapter()
.targetInfoForPosition(0, false);