PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-15 01:05:41 +00:00
committed by Android (Google) Code Review
parent 77a34f69c6 0018f1680f
commit ef8e2db876
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/dashboard/DashboardAdapter.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.dashboard;
import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
@@ -34,7 +35,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Space;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -418,11 +418,12 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
holder.summary.setText(null);
}
if (curMode == DashboardData.HEADER_MODE_COLLAPSED) {
holder.topSpace.setVisibility(View.VISIBLE);
} else {
holder.topSpace.setVisibility(View.GONE);
}
final Resources res = mContext.getResources();
final int padding = res.getDimensionPixelOffset(
curMode == DashboardData.HEADER_MODE_COLLAPSED
? R.dimen.suggestion_condition_header_padding_collapsed
: R.dimen.suggestion_condition_header_padding_expanded);
holder.itemView.setPadding(0, padding, 0, padding);
holder.itemView.setOnClickListener(v -> {
if (moreSuggestions ) {
@@ -550,13 +551,11 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
public static class SuggestionAndConditionHeaderHolder extends DashboardItemHolder {
public final LinearLayout icons;
public final ImageView expandIndicator;
public final Space topSpace;
public SuggestionAndConditionHeaderHolder(View itemView) {
super(itemView);
icons = itemView.findViewById(id.additional_icons);
expandIndicator = itemView.findViewById(id.expand_indicator);
topSpace = itemView.findViewById(id.top_space);
}
}