summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2014-11-10 18:35:02 (GMT)
committerAdnan <adnan@cyngn.com>2014-11-19 23:54:00 (GMT)
commit8b6ad0ca18654695cedc2d369b271549630d8a2d (patch)
treec42efedee45915446b830c96b77c11c36830cb81
parentfff0d2390d1fd91ee1d9caca3a37ffc959ac1231 (diff)
downloadandroid_packages_apps_Trebuchet-8b6ad0ca18654695cedc2d369b271549630d8a2d.zip
android_packages_apps_Trebuchet-8b6ad0ca18654695cedc2d369b271549630d8a2d.tar.gz
android_packages_apps_Trebuchet-8b6ad0ca18654695cedc2d369b271549630d8a2d.tar.bz2
Trebuchet: Fix Insets with SearchBar
Change-Id: I6a79447eeff47fab5f604e823a2210e32580e909
-rw-r--r--res/values/dimens.xml2
-rw-r--r--src/com/android/launcher3/DragLayer.java11
2 files changed, 3 insertions, 10 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4980e09..15f37ad 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -18,7 +18,7 @@
<!-- Dynamic Grid -->
<dimen name="dynamic_grid_edge_margin">6dp</dimen>
<dimen name="dynamic_grid_search_bar_max_width">500dp</dimen>
- <dimen name="dynamic_grid_search_bar_height">56dp</dimen>
+ <dimen name="dynamic_grid_search_bar_height">52dp</dimen>
<dimen name="dynamic_grid_page_indicator_height">20dp</dimen>
<dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen>
<dimen name="dynamic_grid_all_apps_cell_padding">18dp</dimen>
diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java
index 4b40f4b..691b095 100644
--- a/src/com/android/launcher3/DragLayer.java
+++ b/src/com/android/launcher3/DragLayer.java
@@ -137,16 +137,9 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
continue;
}
setInsets(child, insets, mInsets);
- final FrameLayout.LayoutParams flp = (FrameLayout.LayoutParams) child.getLayoutParams();
- if (child instanceof Insettable) {
- ((Insettable)child).setInsets(insets);
- } else {
- flp.topMargin += (insets.top - mInsets.top);
- flp.leftMargin += (insets.left - mInsets.left);
- flp.rightMargin += (insets.right - mInsets.right);
- flp.bottomMargin += (insets.bottom - mInsets.bottom);
+ if (child.getId() == R.id.search_drop_target_bar) {
+ continue;
}
- child.setLayoutParams(flp);
}
mInsets.set(insets);
return true; // I'll take it from here