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

Commit 3289b5e6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Fix talkback for switch on work in ResolverActivity" into... 

Merge "Merge "Fix talkback for switch on work in ResolverActivity" into rvc-dev am: 606980b3 am: 44f514ed am: eb2eeab0" into rvc-qpr-dev-plus-aosp am: 793f22a1

Change-Id: Ic85c5ce3091867a10e8ce3d91d0cd98d944a700b
parents 01208327 793f22a1

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

+18 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { 
    private final Context mContext;

    private int mCurrentPage;

    private OnProfileSelectedListener mOnProfileSelectedListener;

    private OnSwitchOnWorkSelectedListener mOnSwitchOnWorkSelectedListener;

    private Set<Integer> mLoadedPages;

    private final UserHandle mPersonalProfileUserHandle;

    private final UserHandle mWorkProfileUserHandle;
@@ -124,6 +125,10 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { 
        mOnProfileSelectedListener = listener;

    }



    void setOnSwitchOnWorkSelectedListener(OnSwitchOnWorkSelectedListener listener) {

        mOnSwitchOnWorkSelectedListener = listener;

    }



    Context getContext() {

        return mContext;

    }
@@ -397,6 +402,9 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { 
                    ProfileDescriptor descriptor = getItem(

                            userHandleToPageIndex(listAdapter.getUserHandle()));

                    showSpinner(descriptor.getEmptyStateView());

                    if (mOnSwitchOnWorkSelectedListener != null) {

                        mOnSwitchOnWorkSelectedListener.onSwitchOnWorkSelected();

                    }

                    mInjector.requestQuietModeEnabled(false, mWorkProfileUserHandle);

                });

        return true;
@@ -575,6 +583,16 @@ public abstract class AbstractMultiProfilePagerAdapter extends PagerAdapter { 
        void onProfileSelected(int profileIndex);

    }



    /**

     * Listener for when the user switches on the work profile from the work tab.

     */

    interface OnSwitchOnWorkSelectedListener {

        /**

         * Callback for when the user switches on the work profile from the work tab.

         */

        void onSwitchOnWorkSelected();

    }



    /**

     * Describes an injector to be used for cross profile functionality. Overridable for testing.

     */

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

+7 −0
Original line number Diff line number Diff line
@@ -1662,6 +1662,13 @@ public class ResolverActivity extends Activity implements 
                    resetButtonBar();

                    resetCheckedItem();

                });

        mMultiProfilePagerAdapter.setOnSwitchOnWorkSelectedListener(

                () -> {

                    final View workTab = tabHost.getTabWidget().getChildAt(1);

                    workTab.setFocusable(true);

                    workTab.setFocusableInTouchMode(true);

                    workTab.requestFocus();

                });

        findViewById(R.id.resolver_tab_divider).setVisibility(View.VISIBLE);

    }