Merge "Check if QQS shows player when updating height" into rvc-dev (9e76544c) · Commits · e / os / android_frameworks_base

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

+9 −6

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,10 @@ public class QuickQSPanel extends QSPanel {
	private int mMaxTiles;		private int mMaxTiles;
	protected QSPanel mFullPanel;		protected QSPanel mFullPanel;
	private QuickQSMediaPlayer mMediaPlayer;		private QuickQSMediaPlayer mMediaPlayer;
			/** Whether or not the QS media player feature is enabled. */
	private boolean mUsingMediaPlayer;		private boolean mUsingMediaPlayer;
			/** Whether or not the QuickQSPanel currently contains a media player. */
			private boolean mHasMediaPlayer;
	private LinearLayout mHorizontalLinearLayout;		private LinearLayout mHorizontalLinearLayout;

	// Only used with media		// Only used with media
	@@ -185,8 +188,8 @@ public class QuickQSPanel extends QSPanel {

	boolean switchTileLayout() {		boolean switchTileLayout() {
	if (!mUsingMediaPlayer) return false;		if (!mUsingMediaPlayer) return false;
	if (mMediaPlayer.hasMediaSession()		mHasMediaPlayer = mMediaPlayer.hasMediaSession();
	&& mHorizontalLinearLayout.getVisibility() == View.GONE) {		if (mHasMediaPlayer && mHorizontalLinearLayout.getVisibility() == View.GONE) {
	mHorizontalLinearLayout.setVisibility(View.VISIBLE);		mHorizontalLinearLayout.setVisibility(View.VISIBLE);
	((View) mRegularTileLayout).setVisibility(View.GONE);		((View) mRegularTileLayout).setVisibility(View.GONE);
	mTileLayout.setListening(false);		mTileLayout.setListening(false);
	@@ -198,8 +201,7 @@ public class QuickQSPanel extends QSPanel {
	if (mHost != null) setTiles(mHost.getTiles());		if (mHost != null) setTiles(mHost.getTiles());
	mTileLayout.setListening(mListening);		mTileLayout.setListening(mListening);
	return true;		return true;
	} else if (!mMediaPlayer.hasMediaSession()		} else if (!mHasMediaPlayer && mHorizontalLinearLayout.getVisibility() == View.VISIBLE) {
	&& mHorizontalLinearLayout.getVisibility() == View.VISIBLE) {
	mHorizontalLinearLayout.setVisibility(View.GONE);		mHorizontalLinearLayout.setVisibility(View.GONE);
	((View) mRegularTileLayout).setVisibility(View.VISIBLE);		((View) mRegularTileLayout).setVisibility(View.VISIBLE);
	mTileLayout.setListening(false);		mTileLayout.setListening(false);
	@@ -215,8 +217,9 @@ public class QuickQSPanel extends QSPanel {
	return false;		return false;
	}		}

	public boolean hasMediaPlayerSession() {		/** Returns true if this panel currently contains a media player. */
	return mMediaPlayer.hasMediaSession();		public boolean hasMediaPlayer() {
			return mHasMediaPlayer;
	}		}

	@Override		@Override

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -344,7 +344,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements
	if (mQsDisabled) {		if (mQsDisabled) {
	lp.height = resources.getDimensionPixelSize(		lp.height = resources.getDimensionPixelSize(
	com.android.internal.R.dimen.quick_qs_offset_height);		com.android.internal.R.dimen.quick_qs_offset_height);
	} else if (useQsMediaPlayer(mContext) && mHeaderQsPanel.hasMediaPlayerSession()) {		} else if (useQsMediaPlayer(mContext) && mHeaderQsPanel.hasMediaPlayer()) {
	lp.height = Math.max(getMinimumHeight(),		lp.height = Math.max(getMinimumHeight(),
	resources.getDimensionPixelSize(		resources.getDimensionPixelSize(
	com.android.internal.R.dimen.quick_qs_total_height_with_media));		com.android.internal.R.dimen.quick_qs_total_height_with_media));