diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-14 23:58:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-14 23:58:14 +0000 |
commit | 321dea1346ba6e0e49a0cfc49b9303f3d7cfe303 (patch) | |
tree | 577f6772d6b2496efb5ecc2802c4487269a5f8f2 /src/com | |
parent | 2a1be7a6165b49d21396bcb228a468bc79dd4d3e (diff) | |
parent | 6fdc2035ea04aefc09d54a1943eef168ca270d6d (diff) | |
download | android_packages_apps_Trebuchet-321dea1346ba6e0e49a0cfc49b9303f3d7cfe303.tar.gz android_packages_apps_Trebuchet-321dea1346ba6e0e49a0cfc49b9303f3d7cfe303.tar.bz2 android_packages_apps_Trebuchet-321dea1346ba6e0e49a0cfc49b9303f3d7cfe303.zip |
Merge "Widget row should not be cut off on the right, when there is an indent" into ub-launcher3-burnaby
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/widget/WidgetsListAdapter.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/widget/WidgetsListAdapter.java b/src/com/android/launcher3/widget/WidgetsListAdapter.java index d07c9553a..d2ea25230 100644 --- a/src/com/android/launcher3/widget/WidgetsListAdapter.java +++ b/src/com/android/launcher3/widget/WidgetsListAdapter.java @@ -163,13 +163,15 @@ public class WidgetsListAdapter extends Adapter<WidgetsRowViewHolder> { ViewGroup container = (ViewGroup) mLayoutInflater.inflate( R.layout.widgets_list_row_view, parent, false); LinearLayout cellList = (LinearLayout) container.findViewById(R.id.widgets_cell_list); - MarginLayoutParams lp = (MarginLayoutParams) cellList.getLayoutParams(); + + // if the end padding is 0, then container view (horizontal scroll view) doesn't respect + // the end of the linear layout width + the start padding and doesn't allow scrolling. if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { - lp.setMarginStart(mIndent); + cellList.setPaddingRelative(mIndent, 0, 1, 0); } else { - lp.leftMargin = mIndent; + cellList.setPadding(mIndent, 0, 1, 0); } - cellList.setLayoutParams(lp); + return new WidgetsRowViewHolder(container); } |