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

Merge "Revise homepage sticky cards UI"

Browse Source
This commit is contained in:
Jason Chiu
2020-02-12 15:58:52 +00:00
committed by Android (Google) Code Review
parent 4bd4a72d5a 55563896be
commit d13734fe59
6 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardRenderer.java
View File

@@ -59,7 +59,7 @@ public class ConditionHeaderContextualCardRenderer implements ContextualCardRend
final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory(
mContext).getMetricsFeatureProvider();
view.icons.removeAllViews();
headerCard.getConditionalCards().stream().forEach(card -> {
headerCard.getConditionalCards().forEach(card -> {
final ImageView icon = (ImageView) LayoutInflater.from(mContext).inflate(
R.layout.conditional_card_header_icon, view.icons, false);
icon.setImageDrawable(card.getIconDrawable());

2
src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
View File

@@ -166,7 +166,7 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer, Life
@OnLifecycleEvent(Lifecycle.Event.ON_STOP)
public void onStop() {
mFlippedCardSet.stream().forEach(holder -> resetCardView(holder));
mFlippedCardSet.forEach(holder -> resetCardView(holder));
mFlippedCardSet.clear();
}

6
src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.homepage.contextualcards.slices;
import static com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer.VIEW_TYPE_STICKY;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.view.View;
@@ -75,7 +77,9 @@ class SliceFullCardRendererHelper {
// Customize slice view for Settings
cardHolder.sliceView.setShowTitleItems(true);
if (card.isLargeCard()) {
cardHolder.sliceView.setShowHeaderDivider(true);
if (holder.getItemViewType() != VIEW_TYPE_STICKY) {
cardHolder.sliceView.setShowHeaderDivider(true);
}
cardHolder.sliceView.setShowActionDividers(true);
}
}