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

Commit 47fddf4d authored by Nick Chameyev's avatar Nick Chameyev Committed by Automerger Merge Worker
Browse files

Merge "[Chooser/ResolverActivity] Add option to show preview area even if... 

Merge "[Chooser/ResolverActivity] Add option to show preview area even if there are no apps in the tab" into tm-qpr-dev am: 54383d14 am: d63b7747

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20882607



Change-Id: Ibfb0fa0821163501d037599e604973b917c2d20e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 137190a0 d63b7747

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

+14 −2
Original line number Diff line number Diff line
@@ -2953,11 +2953,23 @@ public class ChooserActivity extends ResolverActivity implements 


    private boolean shouldShowStickyContentPreviewNoOrientationCheck() {

        return shouldShowTabs()

                && mMultiProfilePagerAdapter.getListAdapterForUserHandle(

                && (mMultiProfilePagerAdapter.getListAdapterForUserHandle(

                        UserHandle.of(UserHandle.myUserId())).getCount() > 0

                    || shouldShowContentPreviewWhenEmpty())

                && shouldShowContentPreview();

    }



    /**

     * This method could be used to override the default behavior when we hide the preview area

     * when the current tab doesn't have any items.

     *

     * @return true if we want to show the content preview area even if the tab for the current

     *         user is empty

     */

    protected boolean shouldShowContentPreviewWhenEmpty() {

        return false;

    }



    /**

     * @return true if we want to show the content preview area

     */

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

+3 −3
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class ResolverActivity extends Activity implements 
     * <p>Can only be used if there is a work profile.

     * <p>Possible values can be either {@link #PROFILE_PERSONAL} or {@link #PROFILE_WORK}.

     */

    static final String EXTRA_SELECTED_PROFILE =

    protected static final String EXTRA_SELECTED_PROFILE =

            "com.android.internal.app.ResolverActivity.EXTRA_SELECTED_PROFILE";



    /**
@@ -224,8 +224,8 @@ public class ResolverActivity extends Activity implements 
    static final String EXTRA_CALLING_USER =

            "com.android.internal.app.ResolverActivity.EXTRA_CALLING_USER";



    static final int PROFILE_PERSONAL = AbstractMultiProfilePagerAdapter.PROFILE_PERSONAL;

    static final int PROFILE_WORK = AbstractMultiProfilePagerAdapter.PROFILE_WORK;

    protected static final int PROFILE_PERSONAL = AbstractMultiProfilePagerAdapter.PROFILE_PERSONAL;

    protected static final int PROFILE_WORK = AbstractMultiProfilePagerAdapter.PROFILE_WORK;



    private BroadcastReceiver mWorkProfileStateReceiver;

    private UserHandle mHeaderCreatorUser;