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

Commit ef2cc3b6 authored by Paul Soulos's avatar Paul Soulos Committed by Android Git Automerger
Browse files

am ac9b3166: Use CardView for cards UI Tweaks with Allen 

* commit 'ac9b3166':
  Use CardView for cards UI Tweaks with Allen
parents 40b7a598 ac9b3166

Android.mk

+5 −2
Original line number Diff line number Diff line
@@ -10,12 +10,14 @@ src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src 
res_dirs := res $(contacts_common_dir)/res $(phone_common_dir)/res



LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \

    frameworks/support/v7/cardview/res



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages com.android.contacts.common \

    --extra-packages com.android.phone.common

    --extra-packages com.android.phone.common \

    --extra-packages android.support.v7.cardview



LOCAL_JAVA_LIBRARIES := telephony-common voip-common

LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -23,6 +25,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    android-common \

    guava \

    android-support-v13 \

    android-support-v7-cardview \

    android-support-v7-palette \

    android-support-v4 \

    libphonenumber \

res/layout/expanding_entry_card_item.xml

+3 −1
Original line number Diff line number Diff line
@@ -36,12 +36,14 @@ 


    <TextView

        android:id="@+id/header"

        android:textSize="@dimen/expanding_entry_card_title_text_size"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_toEndOf="@+id/icon"

        android:layout_toStartOf="@+id/icon_alternate"

        android:textColor="@color/quickcontact_entry_header_text_color" />

        android:textColor="@color/quickcontact_entry_header_text_color"

        android:layout_marginBottom="@dimen/expanding_entry_card_header_margin_bottom" />



    <TextView

        android:id="@+id/sub_header"

res/layout/expanding_entry_card_view.xml

+6 −2
Original line number Diff line number Diff line
@@ -13,7 +13,11 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:id="@+id/container">



    <TextView

        android:id="@+id/title"
@@ -39,4 +43,4 @@ 
        android:layout_height="wrap_content"

        android:orientation="vertical" />



</merge>
 
 No newline at end of file
 
</LinearLayout>
 
 No newline at end of file

res/layout/quickcontact_content.xml

+9 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

<com.android.contacts.widget.TouchlessScrollView

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true"
@@ -32,22 +33,26 @@ 
        <com.android.contacts.quickcontact.ExpandingEntryCardView

            style="@style/ExpandingEntryCardStyle"

            android:id="@+id/no_contact_data_card"

            android:visibility="gone" />

            android:visibility="gone"

            cardview:cardCornerRadius="@dimen/expanding_entry_card_card_corner_radius" />



        <com.android.contacts.quickcontact.ExpandingEntryCardView

            style="@style/ExpandingEntryCardStyle"

            android:id="@+id/communication_card"

            android:visibility="gone" />

            android:visibility="gone"

            cardview:cardCornerRadius="@dimen/expanding_entry_card_card_corner_radius" />



        <com.android.contacts.quickcontact.ExpandingEntryCardView

            style="@style/ExpandingEntryCardStyle"

            android:id="@+id/recent_card"

            android:visibility="gone" />

            android:visibility="gone"

            cardview:cardCornerRadius="@dimen/expanding_entry_card_card_corner_radius" />



        <com.android.contacts.quickcontact.ExpandingEntryCardView

            style="@style/ExpandingEntryCardStyle"

            android:id="@+id/about_card"

            android:visibility="gone" />

            android:visibility="gone"

            cardview:cardCornerRadius="@dimen/expanding_entry_card_card_corner_radius" />



    </LinearLayout>

res/layout/quickcontact_expanding_entry_card_button.xml

+4 −3
Original line number Diff line number Diff line
@@ -34,13 +34,14 @@ 
            android:id="@+id/text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:drawablePadding="@dimen/expanding_entry_card_button_drawable_padding"

            android:drawablePadding="@dimen/expanding_entry_card_item_image_spacing"

            android:gravity="center_vertical"

            android:layout_weight="0"

            android:paddingBottom="@dimen/expanding_entry_card_button_padding_vertical"

            android:paddingStart="@dimen/expanding_entry_card_button_padding_start"

            android:paddingStart="@dimen/expanding_entry_card_item_padding_start"

            android:paddingTop="@dimen/expanding_entry_card_button_padding_vertical"

            android:textColor="@color/expanding_entry_card_button_text_color" />

            android:textColor="@color/expanding_entry_card_button_text_color"

            android:textSize="@dimen/expanding_entry_card_title_text_size" />



        <LinearLayout

            android:id="@+id/badge_container"