diff options
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 11 | ||||
| -rw-r--r-- | src/org/cyanogenmod/trebuchet/TrebuchetLauncher.java | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index a911e7a63..0f8ce9a20 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1206,6 +1206,7 @@ public class Launcher extends Activity public void setScrollY(int scroll) { scrollY = scroll; + // Be careful of feature check isSearchBarEnabled if (mWorkspace.isOnOrMovingToCustomContent()) { mSearchDropTargetBar.setTranslationY(- scrollY); getQsbBar().setTranslationY(-scrollY); @@ -1215,7 +1216,9 @@ public class Launcher extends Activity public void resetQSBScroll() { mSearchDropTargetBar.animate().translationY(0).start(); - getQsbBar().animate().translationY(0).start(); + if (isSearchBarEnabled()) { + getQsbBar().animate().translationY(0).start(); + } } public interface CustomContentCallbacks { @@ -4933,6 +4936,12 @@ public class Launcher extends Activity mModel.startLoader(true, mWorkspace.getCurrentPage()); mWorkspace.updateCustomContentVisibility(); } + + public boolean isSearchBarEnabled() { + return SettingsProvider.getBoolean(this, + SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH, + R.bool.preferences_interface_homescreen_search_default); + } } interface LauncherTransitionable { diff --git a/src/org/cyanogenmod/trebuchet/TrebuchetLauncher.java b/src/org/cyanogenmod/trebuchet/TrebuchetLauncher.java index ec91e10d7..3c5e6a70b 100644 --- a/src/org/cyanogenmod/trebuchet/TrebuchetLauncher.java +++ b/src/org/cyanogenmod/trebuchet/TrebuchetLauncher.java @@ -212,7 +212,6 @@ public class TrebuchetLauncher extends Launcher { if (mCurrentHomeApp != null) { mQsbScroller = addToCustomContentPage(mCurrentHomeApp.mInstance.createCustomView(), mCustomContentCallbacks, mCurrentHomeApp.mInstance.getName()); - mQsbScroller.setScrollY(200); } } |