Merge "Fix talkback for switch on work in ResolverActivity" into rvc-dev

Author: TreeHugger Robot

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

@@ -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 @@ void setOnProfileSelectedListener(OnProfileSelectedListener listener) {
         mOnProfileSelectedListener = listener;
     }
 
+    void setOnSwitchOnWorkSelectedListener(OnSwitchOnWorkSelectedListener listener) {
+        mOnSwitchOnWorkSelectedListener = listener;
+    }
+
     Context getContext() {
         return mContext;
     }
@@ -397,6 +402,9 @@ private boolean maybeShowWorkProfileOffEmptyState(ResolverListAdapter listAdapte
                     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 interface OnProfileSelectedListener {
         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

@@ -1662,6 +1662,13 @@ private void setupProfileTabs() {
                     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);
     }