Merge cherrypicks of [18992666, 19051608, 19053827, 19046652] into tm-release. (e75a6b77) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values-h800dp/dimens.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -15,9 +15,6 @@
		-->

		<resources>
		<!-- Minimum margin between clock and top of screen or ambient indication -->
		<dimen name="keyguard_clock_top_margin">26dp</dimen>

		<!-- Large clock maximum font size (dp is intentional, to prevent any further scaling) -->
		<dimen name="large_clock_text_size">200dp</dimen>

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -69,11 +69,13 @@ public abstract class MediaOutputBaseAdapter extends
		View mHolderView;
		boolean mIsDragging;
		int mCurrentActivePosition;
		private boolean mIsInitVolumeFirstTime;

		public MediaOutputBaseAdapter(MediaOutputController controller) {
		mController = controller;
		mIsDragging = false;
		mCurrentActivePosition = -1;
		mIsInitVolumeFirstTime = true;
		}

		@Override
		@@ -275,7 +277,7 @@ public abstract class MediaOutputBaseAdapter extends
		mSeekBar.setMaxVolume(device.getMaxVolume());
		final int currentVolume = device.getCurrentVolume();
		if (mSeekBar.getVolume() != currentVolume) {
		if (isCurrentSeekbarInvisible) {
		if (isCurrentSeekbarInvisible && !mIsInitVolumeFirstTime) {
		animateCornerAndVolume(mSeekBar.getProgress(),
		MediaOutputSeekbar.scaleVolumeToProgress(currentVolume));
		} else {
		@@ -284,6 +286,9 @@ public abstract class MediaOutputBaseAdapter extends
		}
		}
		}
		if (mIsInitVolumeFirstTime) {
		mIsInitVolumeFirstTime = false;
		}
		mSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
		@Override
		public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {

packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -139,12 +139,11 @@ public class QSContainerImpl extends FrameLayout implements Dumpable {

		void updateResources(QSPanelController qsPanelController,
		QuickStatusBarHeaderController quickStatusBarHeaderController) {
		int bottomPadding = getResources().getDimensionPixelSize(R.dimen.qs_panel_padding_bottom);
		mQSPanelContainer.setPaddingRelative(
		mQSPanelContainer.getPaddingStart(),
		QSUtils.getQsHeaderSystemIconsAreaHeight(mContext),
		mQSPanelContainer.getPaddingEnd(),
		bottomPadding);
		mQSPanelContainer.getPaddingBottom());

		int horizontalMargins = getResources().getDimensionPixelSize(R.dimen.qs_horizontal_margin);
		int horizontalPadding = getResources().getDimensionPixelSize(

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -362,11 +362,11 @@ public class QSPanel extends LinearLayout implements Tunable {
		protected void updatePadding() {
		final Resources res = mContext.getResources();
		int paddingTop = res.getDimensionPixelSize(R.dimen.qs_panel_padding_top);
		// Bottom padding only when there's a new footer with its height.
		int paddingBottom = res.getDimensionPixelSize(R.dimen.qs_panel_padding_bottom);
		setPaddingRelative(getPaddingStart(),
		paddingTop,
		getPaddingEnd(),
		getPaddingBottom());
		paddingBottom);
		}

		void addOnConfigurationChangedListener(OnConfigurationChangedListener listener) {

packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaOutputAdapterTest.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.media.dialog;
		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		@@ -51,6 +52,8 @@ public class MediaOutputAdapterTest extends SysuiTestCase {
		private static final String TEST_DEVICE_ID_1 = "test_device_id_1";
		private static final String TEST_DEVICE_ID_2 = "test_device_id_2";
		private static final String TEST_SESSION_NAME = "test_session_name";
		private static final int TEST_MAX_VOLUME = 20;
		private static final int TEST_CURRENT_VOLUME = 10;

		// Mock
		private MediaOutputController mMediaOutputController = mock(MediaOutputController.class);
		@@ -64,12 +67,14 @@ public class MediaOutputAdapterTest extends SysuiTestCase {
		private MediaOutputAdapter mMediaOutputAdapter;
		private MediaOutputAdapter.MediaDeviceViewHolder mViewHolder;
		private List<MediaDevice> mMediaDevices = new ArrayList<>();
		MediaOutputSeekbar mSpyMediaOutputSeekbar;

		@Before
		public void setUp() {
		mMediaOutputAdapter = new MediaOutputAdapter(mMediaOutputController, mMediaOutputDialog);
		mViewHolder = (MediaOutputAdapter.MediaDeviceViewHolder) mMediaOutputAdapter
		.onCreateViewHolder(new LinearLayout(mContext), 0);
		mSpyMediaOutputSeekbar = spy(mViewHolder.mSeekBar);

		when(mMediaOutputController.getMediaDevices()).thenReturn(mMediaDevices);
		when(mMediaOutputController.hasAdjustVolumeUserRestriction()).thenReturn(false);
		@@ -168,6 +173,16 @@ public class MediaOutputAdapterTest extends SysuiTestCase {
		assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);
		}

		@Test
		public void onBindViewHolder_initSeekbar_setsVolume() {
		when(mMediaDevice1.getMaxVolume()).thenReturn(TEST_MAX_VOLUME);
		when(mMediaDevice1.getCurrentVolume()).thenReturn(TEST_CURRENT_VOLUME);
		mMediaOutputAdapter.onBindViewHolder(mViewHolder, 0);

		assertThat(mViewHolder.mSeekBar.getVisibility()).isEqualTo(View.VISIBLE);
		assertThat(mViewHolder.mSeekBar.getVolume()).isEqualTo(TEST_CURRENT_VOLUME);
		}

		@Test
		public void onBindViewHolder_bindNonActiveConnectedDevice_verifyView() {
		mMediaOutputAdapter.onBindViewHolder(mViewHolder, 1);