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

Commit 9a87eab2 authored by Yanting Yang's avatar Yanting Yang Committed by Android (Google) Code Review
Browse files

Merge "Improve UX of Deferred Setup"

parents c9e2e774 2784da75

protos/contextual_card_list.proto

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ message ContextualCard { 
    POSSIBLE = 2;

    IMPORTANT = 3;

    EXCLUSIVE = 4;

    DEFERRED_SETUP = 5;

  }



  /** Slice uri of the contextual card */

res/layout/homepage_slice_deferred_setup_tile.xml

0 → 100644
+79 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2019 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



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

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

    style="@style/ContextualCardStyle"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <ViewFlipper

        android:id="@+id/view_flipper"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <LinearLayout

            android:id="@+id/content"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="left"

            android:orientation="vertical"

            android:paddingBottom="@dimen/homepage_deferred_setup_card_padding_bottom"

            android:paddingEnd="@dimen/homepage_card_padding_end"

            android:paddingStart="@dimen/homepage_card_padding_start"

            android:paddingTop="@dimen/homepage_deferred_setup_card_padding_top">



            <ImageView

                android:id="@android:id/icon"

                android:layout_width="@dimen/homepage_card_icon_size"

                android:layout_height="@dimen/homepage_card_icon_size"/>



            <TextView

                android:id="@android:id/title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/homepage_deferred_setup_card_title_margin_top"

                android:ellipsize="end"

                android:maxLines="2"

                android:minLines="1"

                android:textAppearance="@style/TextAppearance.DeferredSetupCardTitle"/>



            <TextView

                android:id="@android:id/summary"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/homepage_deferred_setup_card_summary_margin_top"

                android:ellipsize="end"

                android:maxLines="2"

                android:minLines="1"

                android:textAppearance="@style/TextAppearance.DeferredSetupCardSummary"/>



            <Button

                android:id="@+id/finish_setup"

                style="@style/DeferredSetupCardButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/homepage_deferred_setup_card_button_margin_top"

                android:text="@string/suggestion_button_text"/>



        </LinearLayout>



        <!--dismissal view-->

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



    </ViewFlipper>

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

res/values/dimens.xml

+9 −0
Original line number Diff line number Diff line
@@ -333,6 +333,15 @@ 
    <dimen name="homepage_half_card_padding_top">12dp</dimen>

    <dimen name="homepage_half_card_padding_bottom">16dp</dimen>

    <dimen name="homepage_half_card_title_margin_top">12dp</dimen>

    <dimen name="homepage_deferred_setup_card_padding_top">16dp</dimen>

    <dimen name="homepage_deferred_setup_card_padding_bottom">12dp</dimen>

    <dimen name="homepage_deferred_setup_card_title_margin_top">12dp</dimen>

    <dimen name="homepage_deferred_setup_card_summary_margin_top">2dp</dimen>

    <dimen name="homepage_deferred_setup_card_button_margin_top">8dp</dimen>

    <dimen name="homepage_deferred_setup_card_button_padding_top">8dp</dimen>

    <dimen name="homepage_deferred_setup_card_button_padding_bottom">8dp</dimen>

    <dimen name="homepage_deferred_setup_card_button_padding_start">24dp</dimen>

    <dimen name="homepage_deferred_setup_card_button_padding_end">24dp</dimen>



    <!-- Homepage dismissal cards size and padding -->

    <dimen name="homepage_card_dismissal_margin_top">12dp</dimen>

res/values/styles.xml

+20 −0
Original line number Diff line number Diff line
@@ -462,4 +462,24 @@ 
        <item name="titleSize">@*android:dimen/text_size_subhead_material</item>

    </style>



    <style name="TextAppearance.DeferredSetupCardTitle">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

        <item name="android:textSize">16sp</item>

    </style>



    <style name="TextAppearance.DeferredSetupCardSummary"

           parent="@*android:style/TextAppearance.DeviceDefault.Body1">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>



    <style name="DeferredSetupCardButton" parent="android:Widget.DeviceDefault.Button.Colored">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

        <item name="android:paddingBottom">@dimen/homepage_deferred_setup_card_button_padding_bottom</item>

        <item name="android:paddingEnd">@dimen/homepage_deferred_setup_card_button_padding_end</item>

        <item name="android:paddingStart">@dimen/homepage_deferred_setup_card_button_padding_start</item>

        <item name="android:paddingTop">@dimen/homepage_deferred_setup_card_button_padding_top</item>

        <item name="android:textAllCaps">false</item>

        <item name="android:textSize">14sp</item>

    </style>



</resources>

src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java

+4 −0
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ public class ContextualCardLookupTable { 
                        LegacySuggestionContextualCardRenderer.VIEW_TYPE,

                        LegacySuggestionContextualCardController.class,

                        LegacySuggestionContextualCardRenderer.class));

                add(new ControllerRendererMapping(CardType.SLICE,

                        SliceContextualCardRenderer.VIEW_TYPE_DEFERRED_SETUP,

                        SliceContextualCardController.class,

                        SliceContextualCardRenderer.class));

                add(new ControllerRendererMapping(CardType.SLICE,

                        SliceContextualCardRenderer.VIEW_TYPE_FULL_WIDTH,

                        SliceContextualCardController.class,