norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Simplify the way the message overlay works

Browse Source 
Take advantage of addContentView and just leave the view around when done with
it; it's not too heavy
This commit is contained in:
Christopher Eby 2010-03-21 17:10:10 -05:00
parent 9e1aff4645
commit e6412a9001
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/org/kreed/vanilla/FullPlaybackActivity.java
View File

@ -43,7 +43,6 @@ import android.widget.TextView;
public class FullPlaybackActivity extends PlaybackActivity implements View.OnClickListener, SeekBar.OnSeekBarChangeListener, View.OnFocusChangeListener { public class FullPlaybackActivity extends PlaybackActivity implements View.OnClickListener, SeekBar.OnSeekBarChangeListener, View.OnFocusChangeListener {
private IPlaybackService mService; private IPlaybackService mService;
private ViewGroup mLayout;
private RelativeLayout mMessageOverlay; private RelativeLayout mMessageOverlay;
private View mControlsTop; private View mControlsTop;
private View mControlsBottom; private View mControlsBottom;
@ -74,8 +73,6 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
mCoverView = (CoverView)findViewById(R.id.cover_view); mCoverView = (CoverView)findViewById(R.id.cover_view);
mCoverView.setOnClickListener(this); mCoverView.setOnClickListener(this);
mLayout = (ViewGroup)mCoverView.getParent();
mControlsTop = findViewById(R.id.controls_top); mControlsTop = findViewById(R.id.controls_top);
mControlsBottom = findViewById(R.id.controls_bottom); mControlsBottom = findViewById(R.id.controls_bottom);
@ -96,52 +93,39 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
mSeekBar.setOnFocusChangeListener(this); 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 @Override
protected void setState(int state) protected void setState(int state)
{ {
if (state == mState)
return;
mState = state; mState = state;
if (mMessageOverlay != null)
mMessageOverlay.setVisibility(View.GONE);
switch (state) { switch (state) {
case PlaybackService.STATE_PLAYING: case PlaybackService.STATE_PLAYING:
if (!mHandler.hasMessages(HIDE)) if (!mHandler.hasMessages(HIDE))
mControlsBottom.setVisibility(View.GONE); mControlsBottom.setVisibility(View.GONE);
// fall through // fall through
case PlaybackService.STATE_NORMAL: case PlaybackService.STATE_NORMAL:
removeMessageOverlay();
if (state == PlaybackService.STATE_NORMAL) if (state == PlaybackService.STATE_NORMAL)
mControlsBottom.setVisibility(View.VISIBLE); mControlsBottom.setVisibility(View.VISIBLE);
mPlayPauseButton.setImageResource(state == PlaybackService.STATE_PLAYING ? R.drawable.pause : R.drawable.play); mPlayPauseButton.setImageResource(state == PlaybackService.STATE_PLAYING ? R.drawable.pause : R.drawable.play);
break; break;
case PlaybackService.STATE_NO_MEDIA: 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 = RelativeLayout.LayoutParams layoutParams =
new RelativeLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, new RelativeLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
@ -156,7 +140,6 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
} }
} }
@Override @Override
protected void setService(IPlaybackService service) protected void setService(IPlaybackService service)
{ {