summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2015-09-29 20:58:02 (GMT)
committerDanesh M <daneshm90@gmail.com>2015-09-29 20:58:02 (GMT)
commitcdc6806aa76856549077b0c9eefd18dd66cbecdd (patch)
tree8a871d8d90f313c65223ab2fd5b3f2291cd91c85
parent5c3653f3e9f5589ac964ca2758d7ec7d29b2b61e (diff)
downloadandroid_packages_apps_Trebuchet-cdc6806aa76856549077b0c9eefd18dd66cbecdd.zip
android_packages_apps_Trebuchet-cdc6806aa76856549077b0c9eefd18dd66cbecdd.tar.gz
android_packages_apps_Trebuchet-cdc6806aa76856549077b0c9eefd18dd66cbecdd.tar.bz2
Trebuchet : Fix drawer inset & search visibility
- If we receive INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED/INTENT_ACTION_SEARCHABLES_CHANGED we call bindSearchablesChanged which re-adds a search bar and doesn't restore visibility. This patch ensures we don't show the search bar when its not suppose to. - Don't increment margins, since there is no guarantee that the method is only invoked once. Change-Id: I4054a2aaba50a3692c6059afe8efe9796fcd68f4
-rw-r--r--src/com/android/launcher3/AppDrawerContainer.java2
-rw-r--r--src/com/android/launcher3/Launcher.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AppDrawerContainer.java b/src/com/android/launcher3/AppDrawerContainer.java
index ed001fe..f67bd9a 100644
--- a/src/com/android/launcher3/AppDrawerContainer.java
+++ b/src/com/android/launcher3/AppDrawerContainer.java
@@ -26,7 +26,7 @@ public class AppDrawerContainer extends InsettableFrameLayout {
// Scrubber
view = findViewById(R.id.app_drawer_scrubber_container);
LinearLayout.LayoutParams llp = (LinearLayout.LayoutParams) view.getLayoutParams();
- llp.bottomMargin += insets.bottom - mInsets.bottom;
+ llp.bottomMargin = insets.bottom - mInsets.bottom;
view.setLayoutParams(llp);
}
}
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f98051d..46b2ccb 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -5247,6 +5247,7 @@ public class Launcher extends Activity
mQsb = null;
}
mSearchDropTargetBar.setQsbSearchBar(getQsbBar());
+ mGrid.layout(this);
}
/**