Merge "Fixing media player clipped in shade in large screen portrait" into tm-qpr-dev (3900c53c) · Commits · e / os / android_frameworks_base

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

+0 −50

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.policy.BrightnessMirrorController;
		import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
		import com.android.systemui.util.LifecycleFragment;
		import com.android.systemui.util.Utils;

		import java.io.PrintWriter;
		import java.util.Arrays;
		@@ -624,7 +623,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		if (mQSAnimator != null) {
		mQSAnimator.setPosition(expansion);
		}
		updateMediaPositions();
		}

		private void setAlphaAnimationProgress(float progress) {
		@@ -661,54 +659,6 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
		- mQSPanelScrollView.getPaddingBottom());
		}

		private void updateMediaPositions() {
		if (Utils.useQsMediaPlayer(getContext())) {
		mContainer.getLocationOnScreen(mTmpLocation);
		float absoluteBottomPosition = mTmpLocation[1] + mContainer.getHeight();
		// The Media can be scrolled off screen by default, let's offset it
		float expandedMediaPosition = absoluteBottomPosition - mQSPanelScrollView.getScrollY()
		+ mQSPanelScrollView.getScrollRange();
		pinToBottom(expandedMediaPosition, mQsMediaHost, true /* expanded */);
		// The expanded media host should never move above the laid out position
		pinToBottom(absoluteBottomPosition, mQqsMediaHost, false /* expanded */);
		}
		}

		private void pinToBottom(float absoluteBottomPosition, MediaHost mediaHost, boolean expanded) {
		View hostView = mediaHost.getHostView();
		// On keyguard we cross-fade to expanded, so no need to pin it.
		// If the collapsed qs isn't visible, we also just keep it at the laid out position.
		if (mLastQSExpansion > 0 && !isKeyguardState() && mQqsMediaHost.getVisible()) {
		float targetPosition = absoluteBottomPosition - getTotalBottomMargin(hostView)
		- hostView.getHeight();
		float currentPosition = mediaHost.getCurrentBounds().top
		- hostView.getTranslationY();
		float translationY = targetPosition - currentPosition;
		if (expanded) {
		// Never go below the laid out position. This is necessary since the qs panel can
		// change in height and we don't want to ever go below it's position
		translationY = Math.min(translationY, 0);
		} else {
		translationY = Math.max(translationY, 0);
		}
		hostView.setTranslationY(translationY);
		} else {
		hostView.setTranslationY(0);
		}
		}

		private float getTotalBottomMargin(View startView) {
		int result = 0;
		View child = startView;
		View parent = (View) startView.getParent();
		while (!(parent instanceof QSContainerImpl) && parent != null) {
		result += parent.getHeight() - child.getBottom();
		child = parent;
		parent = (View) parent.getParent();
		}
		return result;
		}

		private boolean headerWillBeAnimating() {
		return mState == StatusBarState.KEYGUARD && mShowCollapsedOnKeyguard
		&& !isKeyguardState();