summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/eleven/ui
diff options
context:
space:
mode:
authorUtkarsh Gupta <utkarsh.eminem@gmail.com>2015-07-21 16:34:10 +0530
committerUtkarsh Gupta <utkarsh.eminem@gmail.com>2015-07-21 16:42:23 +0530
commit643192402417cd2402b897e2c319e9d5fef3cf3d (patch)
tree86635b707bef1655750ece12b6f695e6583cefcb /src/com/cyanogenmod/eleven/ui
parent1cd8c8dd846d8c7df7f007266fedf98567d9230b (diff)
downloadandroid_packages_apps_Eleven-643192402417cd2402b897e2c319e9d5fef3cf3d.tar.gz
android_packages_apps_Eleven-643192402417cd2402b897e2c319e9d5fef3cf3d.tar.bz2
android_packages_apps_Eleven-643192402417cd2402b897e2c319e9d5fef3cf3d.zip
Upgrade visualizer
* A different visualizer: http://imgur.com/npV2zyO * Much smoother than the current one, Always stays above 60fps (even in powersave mode). * Abandon android-visualizer library. * Set visualizer color alpha to 75% Change-Id: I08ad5815893735f4427e84d460c4f7a06bf4b019 Signed-off-by: Utkarsh Gupta <utkarsh.eminem@gmail.com>
Diffstat (limited to 'src/com/cyanogenmod/eleven/ui')
-rw-r--r--src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java15
-rw-r--r--src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java30
2 files changed, 24 insertions, 21 deletions
diff --git a/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java b/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
index 775fe55..68819b1 100644
--- a/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
@@ -182,10 +182,10 @@ public class HomeActivity extends SlidingPanelActivity implements
@Override
public void onWindowFocusChanged(boolean hasFocus) {
- getAudioPlayerFragment().onWindowFocusChanged(hasFocus
- && (getCurrentPanel() == Panel.MusicPlayer));
-
super.onWindowFocusChanged(hasFocus);
+
+ getAudioPlayerFragment().setVisualizerVisible(hasFocus
+ && getCurrentPanel() == Panel.MusicPlayer);
}
private void updateStatusBarColor() {
@@ -203,7 +203,7 @@ public class HomeActivity extends SlidingPanelActivity implements
}
@Override
protected void onPostExecute(BitmapWithColors bmc) {
- updateEqualizerColor(bmc != null
+ updateVisualizerColor(bmc != null
? bmc.getVibrantColor() : Color.TRANSPARENT);
updateStatusBarColor(bmc != null
? bmc.getVibrantDarkColor() : Color.TRANSPARENT);
@@ -212,11 +212,12 @@ public class HomeActivity extends SlidingPanelActivity implements
}
}
- private void updateEqualizerColor(int color) {
+ private void updateVisualizerColor(int color) {
if (color == Color.TRANSPARENT) {
- color = getResources().getColor(R.color.equalizer_fill_color);
+ color = getResources().getColor(R.color.visualizer_fill_color);
}
- getAudioPlayerFragment().updateVisualizerColor(color);
+
+ getAudioPlayerFragment().setVisualizerColor(color);
}
private void updateStatusBarColor(int color) {
diff --git a/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
index 3b87698..4ecce67 100644
--- a/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
@@ -61,7 +61,6 @@ import com.cyanogenmod.eleven.utils.MusicUtils;
import com.cyanogenmod.eleven.utils.NavUtils;
import com.cyanogenmod.eleven.utils.PreferenceUtils;
import com.cyanogenmod.eleven.widgets.BrowseButton;
-import com.cyanogenmod.eleven.widgets.EqualizerView;
import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
import com.cyanogenmod.eleven.widgets.NoResultsContainer;
import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
@@ -69,6 +68,7 @@ import com.cyanogenmod.eleven.widgets.QueueButton;
import com.cyanogenmod.eleven.widgets.RepeatButton;
import com.cyanogenmod.eleven.widgets.RepeatingImageButton;
import com.cyanogenmod.eleven.widgets.ShuffleButton;
+import com.cyanogenmod.eleven.widgets.VisualizerView;
import java.lang.ref.WeakReference;
@@ -132,8 +132,8 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection,
// Total time
private TextView mTotalTime;
- // Equalizer View
- private EqualizerView mEqualizerView;
+ // Visualizer View
+ private VisualizerView mVisualizerView;
// Equalizer Gradient
private View mEqualizerGradient;
@@ -196,8 +196,8 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection,
initPlaybackControls();
- mEqualizerView = (EqualizerView) mRootView.findViewById(R.id.equalizerView);
- mEqualizerView.initialize(getActivity());
+ mVisualizerView = (VisualizerView) mRootView.findViewById(R.id.visualizerView);
+ mVisualizerView.initialize(getActivity());
mEqualizerGradient = mRootView.findViewById(R.id.equalizerGradient);
mLyricsText = (TextView) mRootView.findViewById(R.id.audio_player_lyrics);
@@ -482,10 +482,8 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection,
mQueueEmpty.hideAll();
if (PreferenceUtils.getInstance(getActivity()).getShowVisualizer()) {
mEqualizerGradient.setVisibility(View.VISIBLE);
- mEqualizerView.setEnabled(true);
} else {
mEqualizerGradient.setVisibility(View.GONE);
- mEqualizerView.setEnabled(false);
}
mAddToPlaylistButton.setVisibility(View.VISIBLE);
}
@@ -737,20 +735,24 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection,
@Override
public void onBeginSlide() {
- mEqualizerView.setVisible(false);
+ mVisualizerView.setVisible(false);
}
@Override
public void onFinishSlide(SlidingPanelActivity.Panel visiblePanel) {
- mEqualizerView.setVisible(visiblePanel == SlidingPanelActivity.Panel.MusicPlayer);
+ setVisualizerVisible(visiblePanel == SlidingPanelActivity.Panel.MusicPlayer);
}
- public void onWindowFocusChanged(boolean hasFocus) {
- mEqualizerView.setVisible(hasFocus);
+ public void setVisualizerVisible(boolean visible) {
+ if (visible && PreferenceUtils.getInstance(getActivity()).getShowVisualizer()) {
+ mVisualizerView.setVisible(true);
+ } else {
+ mVisualizerView.setVisible(false);
+ }
}
- public void updateVisualizerColor(int color) {
- mEqualizerView.setColor(color);
+ public void setVisualizerColor(int color) {
+ mVisualizerView.setColor(color);
}
/**
@@ -811,7 +813,7 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection,
audioPlayerFragment.updateNowPlayingInfo();
audioPlayerFragment.dismissPopupMenu();
} else if (action.equals(MusicPlaybackService.PLAYSTATE_CHANGED)) {
- audioPlayerFragment.mEqualizerView.setPlaying(MusicUtils.isPlaying());
+ audioPlayerFragment.mVisualizerView.setPlaying(MusicUtils.isPlaying());
// Set the play and pause image
audioPlayerFragment.mPlayPauseProgressButton.getPlayPauseButton().updateState();
} else if (action.equals(MusicPlaybackService.REPEATMODE_CHANGED)