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

Commit 91febe72 authored by Katherine Kuan's avatar Katherine Kuan Committed by Android (Google) Code Review
Browse files

Merge "Allow phone contact card to switch b/t having/not having social updates"

parents 90cbde8b 51f1071a

res/layout/contact_detail_container_with_updates.xml→res/layout-sw580dp/contact_detail_container.xml

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    android:orientation="vertical"

    android:background="@color/background_primary"

    android:padding="16dip">



    <android.support.v4.view.ViewPager

        android:id="@+id/pager"
@@ -32,6 +34,7 @@ 
        android:layout_alignParentTop="true"

        android:layout_alignParentLeft="true"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>

        android:layout_height="wrap_content"

        android:visibility="gone"/>



</RelativeLayout>
 
 No newline at end of file

res/layout-w470dp/contact_detail_fragment.xml

+1 −2
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:visibility="gone"/>

        android:layout_alignParentTop="true"/>



    <View

        android:id="@+id/touch_intercept_overlay"

res/layout-w470dp/contact_detail_updates_fragment.xml

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:visibility="gone"/>

        android:layout_alignParentTop="true"/>



    <View

        android:id="@+id/touch_intercept_overlay"

res/layout/carousel_about_tab.xml

+1 −2
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ 
        android:layout_height="match_parent"

        android:layout_alignParentLeft="true"

        android:layout_alignParentTop="true"

        android:layout_marginBottom="@dimen/detail_tab_carousel_tab_label_height"

        android:visibility="gone"/>

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



    <TextView

        android:id="@+id/label"