am 321dea13: Merge "Widget row should not be cut off on the right, when there is an indent" into ub-launcher3-burnaby

* commit '321dea1346ba6e0e49a0cfc49b9303f3d7cfe303':
  Widget row should not be cut off on the right, when there is an indent
This commit is contained in:
Hyunyoung Song
2015-07-15 00:09:38 +00:00
committed by Android Git Automerger
@@ -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);
}