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

Browse Source 
Change-Id: If6a593310fec1bc18740498844f5d552a80270ca
This commit is contained in:
Automerger Merge Worker
2020-03-06 15:50:37 +00:00
parent 43423a42f6 4c0513d8c7
commit e338fa2d9d
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; return false;
} }
} }
showListView(activeListAdapter);
return activeListAdapter.rebuildList(doPostProcessing); 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); emptyStateView.findViewById(R.id.resolver_empty_state_progress).setVisibility(View.GONE);
} }
private void showListView(ResolverListAdapter activeListAdapter) { protected void showListView(ResolverListAdapter activeListAdapter) {
ProfileDescriptor descriptor = getItem( ProfileDescriptor descriptor = getItem(
userHandleToPageIndex(activeListAdapter.getUserHandle())); userHandleToPageIndex(activeListAdapter.getUserHandle()));
descriptor.rootView.findViewById(R.id.resolver_list).setVisibility(View.VISIBLE); 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)) { if (shouldShowEmptyState(listAdapter)) {
mMultiProfilePagerAdapter.showEmptyState(listAdapter); mMultiProfilePagerAdapter.showEmptyState(listAdapter);
} else {
mMultiProfilePagerAdapter.showListView(listAdapter);
} }
if (doPostProcessing) { if (doPostProcessing) {
if (mMultiProfilePagerAdapter.getCurrentUserHandle().getIdentifier() if (mMultiProfilePagerAdapter.getCurrentUserHandle().getIdentifier()