From e6412a9001c1bab80bc705a156621b124e74d33f Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sun, 21 Mar 2010 17:10:10 -0500
Subject: [PATCH] Simplify the way the message overlay works

Take advantage of addContentView and just leave the view around when done with
it; it's not too heavy
---
 .../kreed/vanilla/FullPlaybackActivity.java   | 53 +++++++------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java
index 3e551863..05840cdb 100644
--- a/src/org/kreed/vanilla/FullPlaybackActivity.java
+++ b/src/org/kreed/vanilla/FullPlaybackActivity.java
@@ -42,8 +42,7 @@ import android.widget.TextView;
 
 public class FullPlaybackActivity extends PlaybackActivity implements View.OnClickListener, SeekBar.OnSeekBarChangeListener, View.OnFocusChangeListener {
 	private IPlaybackService mService;
-	
-	private ViewGroup mLayout;
+
 	private RelativeLayout mMessageOverlay;
 	private View mControlsTop;
 	private View mControlsBottom;
@@ -74,8 +73,6 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
 		mCoverView = (CoverView)findViewById(R.id.cover_view);
 		mCoverView.setOnClickListener(this);
 
-		mLayout = (ViewGroup)mCoverView.getParent();
-
 		mControlsTop = findViewById(R.id.controls_top);
 		mControlsBottom = findViewById(R.id.controls_bottom);
 
@@ -96,56 +93,43 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
 		mSeekBar.setOnFocusChangeListener(this);
 	}
 
-	private void makeMessageOverlay()
-	{
-		if (mMessageOverlay != null) {
-			mMessageOverlay.removeAllViews();
-			return;
-		}
-
-		ViewGroup.LayoutParams layoutParams =
-			new ViewGroup.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT,
-			                              LinearLayout.LayoutParams.FILL_PARENT);
-
-		mMessageOverlay = new RelativeLayout(this);
-		mMessageOverlay.setLayoutParams(layoutParams);
-		mMessageOverlay.setBackgroundColor(Color.BLACK);
-
-		mLayout.addView(mMessageOverlay);
-	}
-
-	private void removeMessageOverlay()
-	{
-		if (mMessageOverlay != null) {
-			mLayout.removeView(mMessageOverlay);
-			mMessageOverlay = null;
-		}
-	}
-
 	@Override
 	protected void setState(int state)
 	{
+		if (state == mState)
+			return;
+
 		mState = state;
 
+		if (mMessageOverlay != null)
+			mMessageOverlay.setVisibility(View.GONE);
+
 		switch (state) {
 		case PlaybackService.STATE_PLAYING:
 			if (!mHandler.hasMessages(HIDE))
 				mControlsBottom.setVisibility(View.GONE);
 			// fall through
 		case PlaybackService.STATE_NORMAL:
-			removeMessageOverlay();
-
 			if (state == PlaybackService.STATE_NORMAL)
 				mControlsBottom.setVisibility(View.VISIBLE);
 
 			mPlayPauseButton.setImageResource(state == PlaybackService.STATE_PLAYING ? R.drawable.pause : R.drawable.play);
 			break;
 		case PlaybackService.STATE_NO_MEDIA:
-			makeMessageOverlay();
+			if (mMessageOverlay == null) {
+				mMessageOverlay = new RelativeLayout(this);
+				mMessageOverlay.setBackgroundColor(Color.BLACK);
+				addContentView(mMessageOverlay,
+					new ViewGroup.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT,
+					                           LinearLayout.LayoutParams.FILL_PARENT));
+			} else {
+				mMessageOverlay.setVisibility(View.VISIBLE);
+				mMessageOverlay.removeAllViews();
+			}
 
 			RelativeLayout.LayoutParams layoutParams =
 				new RelativeLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
-				                              LinearLayout.LayoutParams.WRAP_CONTENT);
+				                                LinearLayout.LayoutParams.WRAP_CONTENT);
 			layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
 
 			TextView text = new TextView(this);
@@ -155,7 +139,6 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
 			break;
 		}
 	}
-	
 
 	@Override
 	protected void setService(IPlaybackService service)