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

Merge "Check whether should auto launch after showing empty state screen" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-24 17:44:37 +00:00
committed by Android (Google) Code Review
parent 091b6ccd4f 4d3be0bf0b
commit 8a5bba3e6a
3 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1027,7 +1027,7 @@ public class ResolverActivity extends Activity implements
@Override // ResolverListCommunicator
public final void onPostListReady(ResolverListAdapter listAdapter, boolean doPostProcessing) {
if (isAutolaunching() || maybeAutolaunchActivity()) {
if (isAutolaunching()) {
return;
}
if (mMultiProfilePagerAdapter.shouldShowEmptyStateScreen(listAdapter)) {
@@ -1035,6 +1035,11 @@ public class ResolverActivity extends Activity implements
} else {
mMultiProfilePagerAdapter.showListView(listAdapter);
}
// showEmptyResolverListEmptyState can mark the tab as loaded,
// which is a precondition for auto launching
if (maybeAutolaunchActivity()) {
return;
}
if (doPostProcessing) {
maybeCreateHeader(listAdapter);
resetButtonBar();