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

Merge "Update spacing and background color for condition/suggestion."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-12 00:25:13 +00:00
committed by Android (Google) Code Review
parent 2a82e1487e 78e08f0f0a
commit 30e0986078
11 changed files with 110 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ 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;
@@ -242,27 +243,9 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
(SuggestionAndConditionContainerHolder) holder, position);
break;
case R.layout.suggestion_condition_header:
/* There are 2 different headers for the suggestions/conditions section. To minimize
visual animation when expanding and collapsing the suggestions/conditions, we are
using the same layout to represent the 2 headers:
1. Suggestion header - when there is any suggestion shown, the suggestion header
will be the first item on the section. It only has the text "Suggestion", and
do nothing when clicked. This header will not be shown when the section is
collapsed, in which case, the SuggestionCondition header will be
shown instead to show the summary info.
2. SuggestionCondition header - the header that shows the summary info for the
suggestion/condition that is currently hidden. It has the expand button to
expand the section. */
if (mDashboardData.getDisplayableSuggestionCount() > 0
&& position == SUGGESTION_CONDITION_HEADER_POSITION
&& mDashboardData.getSuggestionConditionMode()
!= DashboardData.HEADER_MODE_COLLAPSED) {
onBindSuggestionHeader((SuggestionAndConditionHeaderHolder) holder);
} else {
onBindSuggestionConditionHeader((SuggestionAndConditionHeaderHolder) holder,
onBindSuggestionConditionHeader((SuggestionAndConditionHeaderHolder) holder,
(SuggestionConditionHeaderData)
mDashboardData.getItemEntityByPosition(position));
}
mDashboardData.getItemEntityByPosition(position));
break;
case R.layout.suggestion_condition_footer:
holder.itemView.setOnClickListener(v -> {
@@ -349,17 +332,6 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
}
}
private void onBindSuggestionHeader(final SuggestionAndConditionHeaderHolder holder) {
holder.title.setText(R.string.suggestions_title);
holder.title.setTextColor(Color.BLACK);
holder.icon.setVisibility(View.INVISIBLE);
holder.icons.removeAllViews();
holder.icons.setVisibility(View.INVISIBLE);
holder.summary.setVisibility(View.INVISIBLE);
holder.expandIndicator.setVisibility(View.INVISIBLE);
holder.itemView.setOnClickListener(null);
}
@VisibleForTesting
void onBindSuggestionConditionHeader(final SuggestionAndConditionHeaderHolder holder,
SuggestionConditionHeaderData data) {
@@ -419,8 +391,12 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
} else {
holder.summary.setText(null);
}
holder.summary.setVisibility(View.VISIBLE);
holder.expandIndicator.setVisibility(View.VISIBLE);
if (curMode == DashboardData.HEADER_MODE_COLLAPSED) {
holder.topSpace.setVisibility(View.VISIBLE);
} else {
holder.topSpace.setVisibility(View.GONE);
}
holder.itemView.setOnClickListener(v -> {
if (moreSuggestions ) {
@@ -443,9 +419,9 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
@VisibleForTesting
void onBindConditionAndSuggestion(final SuggestionAndConditionContainerHolder holder,
int position) {
// If there is suggestions to show, it will be at position 1
// position 0 is suggestion header.
if (position == (SUGGESTION_CONDITION_HEADER_POSITION + 1)
// If there is suggestions to show, it will be at position 0 as we don't show the suggestion
// header anymore.
if (position == (SUGGESTION_CONDITION_HEADER_POSITION)
&& mDashboardData.getSuggestions() != null) {
mSuggestionAdapter = new SuggestionAdapter(mContext, (List<Tile>)
mDashboardData.getItemEntityByPosition(position), mSuggestionsShownLogged);
@@ -569,11 +545,13 @@ 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);
}
}

11
src/com/android/settings/dashboard/DashboardData.java
View File

@@ -222,14 +222,15 @@ public class DashboardData {
final int hiddenSuggestion =
hasSuggestions ? sizeOf(mSuggestions) - sizeOf(suggestions) : 0;
/* Top suggestion/condition header. This will be present when there is any suggestion or
* condition to show, except in the case that there is only conditions to show and the
* mode is fully expanded. */
/* Top suggestion/condition header. This will be present when there is any suggestion
* and the mode is collapsed, or it only has conditions and the mode is not fully
* expanded. */
addToItemList(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
R.layout.suggestion_condition_header,
STABLE_ID_SUGGESTION_CONDITION_TOP_HEADER,
hasSuggestions
|| hasConditions && mSuggestionConditionMode != HEADER_MODE_FULLY_EXPANDED);
hasSuggestions && mSuggestionConditionMode == HEADER_MODE_COLLAPSED
|| !hasSuggestions && hasConditions
&& mSuggestionConditionMode != HEADER_MODE_FULLY_EXPANDED);
/* Suggestion container. This is the card view that contains the list of suggestions.
* This will be added whenever the suggestion list is not empty */