Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d2d5cc8 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Prevent intent resolver from changing height when no app targets am:... 

Merge "Prevent intent resolver from changing height when no app targets am: 4c0513d8 am: e338fa2d" into rvc-d1-dev-plus-aosp am: 8773bd55

Change-Id: If1955a5cdb7f23bf29ad3646301b99ab52778369
parents 8d5f884a 8773bd55

core/java/com/android/internal/app/AbstractMultiProfilePagerAdapter.java

+1 −2
Original line number Diff line number Diff line
@@ -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);

core/java/com/android/internal/app/ResolverActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -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()