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

Commit 81e7fea1 authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Suggested Aggregations Color and Spacing Tweaks" into ub-contactsdialer-a-dev

parents 2bb85d2c 5368489a

res/layout/quickcontact_collapsed_suggestion_card.xml

+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"

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

    style="@style/ExpandingEntryCardStyle"

    android:layout_height="wrap_content"

    android:layout_height="@dimen/quickcontact_collapse_view_height"

    android:layout_width="match_parent"

    android:visibility="gone"

    android:id="@+id/collapsed_suggestion_card">
@@ -30,22 +30,22 @@ 


        <ImageView

                android:src="@drawable/quantum_ic_assistant_grey600_24"

                android:layout_width="@dimen/detail_network_icon_size"

                android:layout_height="@dimen/detail_network_icon_size"

                android:layout_margin="16dip"

                android:layout_width="@dimen/quickcontact_collapse_icon_size"

                android:layout_height="@dimen/quickcontact_collapse_icon_size"

                android:layout_margin="@dimen/quickcontact_collapse_image_padding"

                android:layout_gravity="center_vertical"/>



        <TextView

                android:id="@+id/collapsed_suggestion_card_title"

                android:textSize="@dimen/expanding_entry_card_title_text_size"

                android:layout_marginLeft="16dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:textColor="@color/quickcontact_entry_header_text_color"

                android:singleLine="true"

                android:ellipsize="end"

                android:paddingTop="@dimen/quickcontact_suggestion_card_image_spacing"

                android:paddingBottom="@dimen/quickcontact_suggestion_card_image_spacing"/>

                android:paddingTop="@dimen/quickcontact_collapse_text_padding"/>



        <ImageView

                android:src="@drawable/ic_menu_expander_minimized_holo_light"

res/layout/quickcontact_expand_suggestion_card.xml

+29 −11
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


        <TextView

            android:id="@+id/expand_suggestion_card_help"

            android:textSize="@dimen/expanding_entry_card_title_text_size"

            android:textSize="@dimen/quickcontact_expanding_help_text_size"

            android:text="@string/suggestion_card_help_message"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -66,10 +66,8 @@ 
            android:paddingStart="@dimen/quickcontact_suggestion_card_image_spacing"/>



        <LinearLayout

            android:layout_height="wrap_content"

            android:layout_height="@dimen/quickcontact_expanding_item_height"

            android:layout_width="match_parent"

            android:layout_marginTop="@dimen/quickcontact_suggestion_card_layout_margin"

            android:layout_marginBottom="@dimen/quickcontact_suggestion_card_layout_margin"

            android:orientation="horizontal">



            <ImageView
@@ -80,6 +78,15 @@ 
                android:layout_marginStart="@dimen/quickcontact_suggestion_card_image_spacing"

                android:scaleType="fitCenter" />



            <LinearLayout

                android:id="@+id/suggestion_for_contact_info"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="@dimen/quickcontact_expanding_item_image_padding"

                android:layout_weight="1"

                android:orientation="vertical"

                android:layout_gravity="center_vertical">



                <TextView

                    android:id="@+id/suggestion_for_name"

                    android:layout_width="match_parent"
@@ -89,8 +96,18 @@ 
                    android:textColor="@color/quickcontact_entry_header_text_color"

                    android:singleLine="true"

                    android:ellipsize="end"

                    android:layout_marginStart="@dimen/expanding_entry_card_item_image_spacing"

                    android:layout_marginEnd="@dimen/expanding_entry_card_item_image_spacing"/>

                    android:layout_marginTop="@dimen/quickcontact_suggestion_card_layout_margin" />



                <TextView

                    android:id="@+id/suggestion_for_contacts_number"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:textAppearance="?android:attr/textAppearanceSmall"

                    android:layout_marginBottom="@dimen/quickcontact_suggestion_card_layout_margin"

                    android:singleLine="true"

                    android:ellipsize="end" />



            </LinearLayout>



        </LinearLayout>
@@ -114,8 +131,11 @@ 


        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="@dimen/quickcontact_expanding_button_section_height"

            android:layout_gravity="center_vertical|end"

            android:layout_marginRight="@dimen/quickcontact_expanding_button_right_padding"

            android:layout_marginTop="@dimen/quickcontact_expanding_button_section_padding"

            android:layout_marginBottom="@dimen/quickcontact_expanding_button_section_padding"

            android:orientation="horizontal">



            <Button
@@ -127,11 +147,9 @@ 


            <Button

                android:id="@+id/link_button"

                style="?android:attr/buttonBarButtonStyle"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/quickcontact_suggestion_link_button"

                android:paddingEnd="@dimen/quickcontact_suggestion_card_image_spacing"/>

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

        </LinearLayout>

    </LinearLayout>

</android.support.v7.widget.CardView>
 
 No newline at end of file

res/layout/quickcontact_suggestion_contact_item.xml

+3 −4
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="horizontal"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/quickcontact_suggestion_card_layout_margin"

    android:layout_marginBottom="@dimen/quickcontact_suggestion_card_layout_margin">

    android:layout_height="@dimen/quickcontact_expanding_item_height"

    android:paddingTop="@dimen/quickcontact_expanding_item_padding">



    <ImageView

        android:id="@+id/aggregation_suggestion_photo"
@@ -33,7 +32,7 @@ 
        android:id="@+id/suggestion_contact_item"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/expanding_entry_card_item_image_spacing"

        android:layout_marginStart="@dimen/quickcontact_expanding_item_image_padding"

        android:layout_weight="1"

        android:orientation="vertical"

        android:layout_gravity="center_vertical">

res/values/colors.xml

+7 −1
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ 
    <!-- Color of button background in compact photo picker. -->

    <color name="google_grey_600">#757575</color>



    <!-- Color of button text color in compact photo picker, 85% white. -->

    <!-- Color of button text in compact photo picker, 85% white. -->

    <color name="photo_action_button_color">#D9FFFFFF</color>



    <!-- Color of text on disabled link contacts button, 25% black. -->

    <color name="disabled_button_text">#40000000</color>



    <!-- Color of background of disabled link contacts button, 15% black. -->

    <color name="disabled_button_background">#26000000</color>

</resources>

res/values/dimens.xml

+13 −2
Original line number Diff line number Diff line
@@ -231,11 +231,22 @@ 
    <dimen name="expanding_entry_card_item_header_only_margin_bottom">2dp</dimen>

    <dimen name="expanding_entry_card_item_no_icon_margin_top">6dp</dimen>



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

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

    <dimen name="quickcontact_suggestion_card_icon_height">40dp</dimen>

    <dimen name="quickcontact_suggestion_card_icon_width">40dp</dimen>

    <dimen name="quickcontact_suggestion_card_image_spacing">20dp</dimen>

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

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

    <dimen name="quickcontact_collapse_view_height">48dp</dimen>

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

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

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

    <dimen name="quickcontact_expanding_help_text_size">14sp</dimen>

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

    <dimen name="quickcontact_expanding_item_height">72dp</dimen>

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

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

    <dimen name="quickcontact_expanding_button_section_height">48dp</dimen>

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



    <!-- The width the that the tabs occupy in the ActionBar when in landscape mode.

         426dp is the height of a "small" screen. We should leave 240dp for