Merge "Fix talkback for switch on work in ResolverActivity" into rvc-dev am:... (0bffbd8c) · Commits · e / os / android_frameworks_base

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);
		}

media/java/android/media/AudioManagerInternal.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -29,13 +29,13 @@ import com.android.server.LocalServices;
		public abstract class AudioManagerInternal {

		public abstract void adjustSuggestedStreamVolumeForUid(int streamType, int direction,
		int flags, String callingPackage, int uid);
		int flags, String callingPackage, int uid, int pid);

		public abstract void adjustStreamVolumeForUid(int streamType, int direction, int flags,
		String callingPackage, int uid);
		String callingPackage, int uid, int pid);

		public abstract void setStreamVolumeForUid(int streamType, int direction, int flags,
		String callingPackage, int uid);
		String callingPackage, int uid, int pid);

		public abstract void setRingerModeDelegate(RingerModeDelegate delegate);

services/core/java/com/android/server/audio/AudioService.java

+138 −40

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/media/MediaSessionRecord.java

+7 −4

File changed.

Preview size limit exceeded, changes collapsed.