summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlinus_lee <llee@cyngn.com>2015-01-05 14:01:36 -0800
committerlinus_lee <llee@cyngn.com>2015-01-05 14:01:36 -0800
commit5ff35e319b54e6df87593a766bb11c0bb8f8aadb (patch)
treea66c264a7b93e293c63cd6c4b0bbf124d702696f
parent6a7b8d8ff2d094318ead1b19561557b4ee2746b0 (diff)
downloadandroid_packages_apps_Eleven-5ff35e319b54e6df87593a766bb11c0bb8f8aadb.tar.gz
android_packages_apps_Eleven-5ff35e319b54e6df87593a766bb11c0bb8f8aadb.tar.bz2
android_packages_apps_Eleven-5ff35e319b54e6df87593a766bb11c0bb8f8aadb.zip
Eleven: Fix equalizer not pausing, action bar hiding and 1px equalizer on xxhdpi
1) Equalizer was not pausing because HomeActivity onSlide wasn't calling super.onSlide 2) Action bar hiding - the hiding/showing of the action bar was ripped out in materialize but was missing in one spot so in some sceanrios we were hiding it and never showing it again 3) the 1px equalizer fuzz was really bothering me especially since it showed while paused Change-Id: I47475e3ea724fa460125c753fb64ec2dd7f095d5
-rw-r--r--res/values-xxhdpi/equalizer_config.xml2
-rw-r--r--src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java2
-rw-r--r--src/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java21
3 files changed, 3 insertions, 22 deletions
diff --git a/res/values-xxhdpi/equalizer_config.xml b/res/values-xxhdpi/equalizer_config.xml
index 63c0e1b..59aca03 100644
--- a/res/values-xxhdpi/equalizer_config.xml
+++ b/res/values-xxhdpi/equalizer_config.xml
@@ -28,5 +28,5 @@
<!-- fudge factors to tweak display for various configs
ends up being dB = ((dB * fuzz_factor) + db_fuzz) -->
<integer name="equalizer_db_fuzz_factor">35</integer>
- <integer name="equalizer_db_fuzz">1</integer>
+ <integer name="equalizer_db_fuzz">0</integer>
</resources> \ No newline at end of file
diff --git a/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java b/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
index 6db3675..f3a796a 100644
--- a/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
@@ -164,6 +164,8 @@ public class HomeActivity extends SlidingPanelActivity {
@Override
protected void onSlide(float slideOffset) {
+ super.onSlide(slideOffset);
+
boolean isInBrowser = getCurrentPanel() == Panel.Browse && slideOffset < 0.7f;
if (isInBrowser != mBrowsePanelActive) {
mBrowsePanelActive = isInBrowser;
diff --git a/src/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java b/src/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java
index 5da768f..2a3665d 100644
--- a/src/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java
@@ -171,27 +171,6 @@ public abstract class SlidingPanelActivity extends BaseActivity {
super.onPause();
}
- @Override
- protected void onResume() {
- super.onResume();
-
- // This is extremely hard to repro but after leaving the app for a long time and coming
- // back to the app, the action bar can be out of sync with the panel we are looking at -
- // this will resync the panels
- if (mTargetNavigatePanel == Panel.None) {
- switch (getCurrentPanel()) {
- case Queue:
- case MusicPlayer:
- getActionBar().hide();
- break;
- case Browse:
- default:
- getActionBar().show();
- break;
- }
- }
- }
-
/**
* {@inheritDoc}
*/