Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388 am: f6a24c2596

Change-Id: I7b3e83bd105dcede447fde3037f4b4737a5cbde1
This commit is contained in:
Automerger Merge Worker
2020-03-10 08:39:49 +00:00
3 changed files with 4 additions and 18 deletions

View File

@@ -16,8 +16,6 @@
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;
@@ -77,9 +75,7 @@ class SliceFullCardRendererHelper {
// Customize slice view for Settings
cardHolder.sliceView.setShowTitleItems(true);
if (card.isLargeCard()) {
if (holder.getItemViewType() != VIEW_TYPE_STICKY) {
cardHolder.sliceView.setShowHeaderDivider(true);
}
cardHolder.sliceView.setShowHeaderDivider(true);
cardHolder.sliceView.setShowActionDividers(true);
}
}