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

Prevent intent resolver from changing height when no app targets am: 4c0513d8c7 am: e338fa2d9d

Browse Source 
Change-Id: I2f547bc0f224ece111864ec202cdf7f95983e728
This commit is contained in:
Automerger Merge Worker
2020-03-06 16:02:27 +00:00
parent 635e376e28 e338fa2d9d
commit b405b8eebc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java
View File

@@ -327,7 +327,6 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter {
return false;
}
}
showListView(activeListAdapter);
return activeListAdapter.rebuildList(doPostProcessing);
}
@@ -408,7 +407,7 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter {
emptyStateView.findViewById(R.id.resolver_empty_state_progress).setVisibility(View.GONE);
}
private void showListView(ResolverListAdapter activeListAdapter) {
protected void showListView(ResolverListAdapter activeListAdapter) {
ProfileDescriptor descriptor = getItem(
userHandleToPageIndex(activeListAdapter.getUserHandle()));
descriptor.rootView.findViewById(R.id.resolver_list).setVisibility(View.VISIBLE);

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

@@ -989,6 +989,8 @@ public class ResolverActivity extends Activity implements
}
if (shouldShowEmptyState(listAdapter)) {
mMultiProfilePagerAdapter.showEmptyState(listAdapter);
} else {
mMultiProfilePagerAdapter.showListView(listAdapter);
}
if (doPostProcessing) {
if (mMultiProfilePagerAdapter.getCurrentUserHandle().getIdentifier()