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

Commit d13734fe authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "Revise homepage sticky cards UI"

parents 4bd4a72d 55563896

res/layout/contextual_slice_full_tile.xml

+10 −16
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 
    android:layout_height="wrap_content"

    style="@style/ContextualCardStyle">



    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">



    <include layout="@layout/dismissal_swipe_background"/>



    <androidx.slice.widget.SliceView
@@ -33,11 +29,9 @@ 
        style="@style/ContextualCardSliceViewStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

        android:importantForAccessibility="no"/>



    <!--dismissal view-->

    <include layout="@layout/contextual_card_dismissal_view"/>



    </FrameLayout>

</com.google.android.material.card.MaterialCardView>
 
 No newline at end of file

res/layout/contextual_slice_sticky_tile.xml

+7 −4
Original line number Diff line number Diff line
@@ -15,11 +15,12 @@ 
     limitations under the License.

-->



<com.google.android.material.card.MaterialCardView

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    style="@style/ContextualCardStyle">

    android:orientation="vertical"

    style="@style/StickyCardStyle">



    <androidx.slice.widget.SliceView

        android:id="@+id/slice_view"
@@ -27,7 +28,9 @@ 
        style="@style/ContextualCardSliceViewStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginBottom="@dimen/contextual_card_vertical_margin"

        android:importantForAccessibility="no"/>



</com.google.android.material.card.MaterialCardView>
 
 No newline at end of file
 
    <include layout="@layout/horizontal_divider"/>



</LinearLayout>

res/values/styles.xml

+6 −0
Original line number Diff line number Diff line
@@ -423,6 +423,12 @@ 
        <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/conditional/ConditionHeaderContextualCardRenderer.java

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

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

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

    }