Merge "Adjusted chooser padding so 2nd line isn't cutoff." into oc-mr1-dev

This commit is contained in:
TreeHugger Robot
2017-09-26 23:14:08 +00:00
committed by Android (Google) Code Review

View File

@@ -1450,11 +1450,16 @@ public class ChooserActivity extends ResolverActivity {
getFirstRowPosition(rowPosition + 1));
int serviceSpacing = holder.row.getContext().getResources()
.getDimensionPixelSize(R.dimen.chooser_service_spacing);
int top = rowPosition == 0 ? serviceSpacing : 0;
if (nextStartType != ChooserListAdapter.TARGET_SERVICE) {
setVertPadding(holder, top, serviceSpacing);
if (rowPosition == 0 && nextStartType != ChooserListAdapter.TARGET_SERVICE) {
// if the row is the only row for target service
setVertPadding(holder, 0, 0);
} else {
setVertPadding(holder, top, 0);
int top = rowPosition == 0 ? serviceSpacing : 0;
if (nextStartType != ChooserListAdapter.TARGET_SERVICE) {
setVertPadding(holder, top, serviceSpacing);
} else {
setVertPadding(holder, top, 0);
}
}
} else {
holder.row.setBackgroundColor(Color.TRANSPARENT);