From b85cfc812be3552a1382b16e2f490fcab467e409 Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Tue, 10 Mar 2020 11:17:28 +0800
Subject: [PATCH] Change sticky card UI back to homepage card style

Fixes: 149371123
Test: visual
Change-Id: Ie1c2bc7b806b818000e9a2e88753f9904a3f30f4
---
 res/layout/contextual_slice_sticky_tile.xml            | 10 +++-------
 res/values/styles.xml                                  |  6 ------
 .../slices/SliceFullCardRendererHelper.java            |  6 +-----
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/res/layout/contextual_slice_sticky_tile.xml b/res/layout/contextual_slice_sticky_tile.xml
index 734697f966e..5991068dfc6 100644
--- a/res/layout/contextual_slice_sticky_tile.xml
+++ b/res/layout/contextual_slice_sticky_tile.xml
@@ -15,12 +15,11 @@
      limitations under the License.
 -->
 
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    style="@style/StickyCardStyle">
+    style="@style/ContextualCardStyle">
 
     <androidx.slice.widget.SliceView
         android:id="@+id/slice_view"
@@ -28,9 +27,6 @@
         style="@style/ContextualCardSliceViewStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/contextual_card_vertical_margin"
         android:importantForAccessibility="no"/>
 
-    <include layout="@layout/horizontal_divider"/>
-
-</LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bd89a6178c0..848eaf14bd9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -462,12 +462,6 @@
         <item name="rippleColor">?android:attr/colorControlHighlight</item>
     </style>
 
-    <style name="StickyCardStyle">
-        <item name="android:layout_marginBottom">@dimen/contextual_card_vertical_margin</item>
-        <item name="android:layout_marginStart">@dimen/contextual_card_side_margin</item>
-        <item name="android:layout_marginEnd">@dimen/contextual_card_side_margin</item>
-    </style>
-
     <style name="SearchBarStyle">
         <item name="android:layout_margin">@dimen/search_bar_margin</item>
         <item name="cardCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
index f634d43a0f0..3f35fb5ba1d 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
@@ -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);
         }
     }