Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03e6686a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

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

Change-Id: Iec81a0116b36372b0a99975e02a3f9a1133d4379
parents 4a76ef4d f6a24c25

res/layout/contextual_slice_sticky_tile.xml

+3 −7
Original line number Diff line number Diff line
@@ -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>

res/values/styles.xml

+0 −6
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java

+1 −5
Original line number Diff line number Diff line
@@ -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.setShowActionDividers(true);

        }

    }