diff options
| author | Peter Schiller <peterschiller@google.com> | 2016-07-07 18:52:21 -0700 |
|---|---|---|
| committer | Peter Schiller <peterschiller@google.com> | 2016-07-07 18:52:51 -0700 |
| commit | 243ad3dbf8a583ecf39669ab83e5bad5dbb2d1b3 (patch) | |
| tree | 807ca652551b30a2e589aae73f441a12c4926f8d /src/com/android/launcher3 | |
| parent | 2ee27b12e9fd642f0f2f9ebcbfdfd50039e21819 (diff) | |
| download | android_packages_apps_Trebuchet-243ad3dbf8a583ecf39669ab83e5bad5dbb2d1b3.tar.gz android_packages_apps_Trebuchet-243ad3dbf8a583ecf39669ab83e5bad5dbb2d1b3.tar.bz2 android_packages_apps_Trebuchet-243ad3dbf8a583ecf39669ab83e5bad5dbb2d1b3.zip | |
Updating alignment of search input
Bug: 30017936
Change-Id: I2f68711762872bc100b41b2b4768d33e2c0cd902
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 12 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 79a15b94c..ae9d83607 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -153,6 +153,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc private ExtendedEditText mSearchInput; private ImageView mSearchIcon; private HeaderElevationController mElevationController; + private int mSearchContainerOffsetTop; private SpannableStringBuilder mSearchQueryBuilder = null; @@ -312,6 +313,8 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc mSearchContainer = findViewById(R.id.search_container); mSearchInput = (ExtendedEditText) findViewById(R.id.search_box_input); mSearchIcon = (ImageView) findViewById(R.id.search_icon); + mSearchContainerOffsetTop = getResources().getDimensionPixelSize( + R.dimen.all_apps_search_bar_margin_top); final LinearLayout.LayoutParams searchParams = (LinearLayout.LayoutParams) mSearchInput.getLayoutParams(); @@ -419,13 +422,12 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc mAdapter.setNumAppsPerRow(mNumAppsPerRow); mApps.setNumAppsPerRow(mNumAppsPerRow, mNumPredictedAppsPerRow, new FullMergeAlgorithm()); if (mNumAppsPerRow > 0) { - int iconSize = availableWidth / mNumAppsPerRow; - int iconSpacing = (iconSize - grid.allAppsIconSizePx) / 2; + int rvPadding = mAppsRecyclerView.getPaddingStart(); // Assumes symmetry final int thumbMaxWidth = getResources().getDimensionPixelSize( R.dimen.container_fastscroll_thumb_max_width); - mSearchContainer.setPaddingRelative( - iconSpacing + thumbMaxWidth, 0, iconSpacing + thumbMaxWidth, 0); + mSearchContainer.setPaddingRelative(rvPadding + thumbMaxWidth, 0, rvPadding + + thumbMaxWidth, 0); } } super.onMeasure(widthMeasureSpec, heightMeasureSpec); @@ -525,7 +527,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc LinearLayout.LayoutParams llp = (LinearLayout.LayoutParams) mSearchInput.getLayoutParams(); - llp.topMargin = insets.top; + llp.topMargin = insets.top + mSearchContainerOffsetTop; mSearchInput.setLayoutParams(llp); mSearchIcon.setLayoutParams(llp); diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 6540a23dd..d0b8abc60 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -203,7 +203,6 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. continue; } - // Find the section name bounds PointF sectionBounds = getAndCacheSectionBounds(sectionName); |