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

Commit fbed59b9 authored by Brian Attwell's avatar Brian Attwell Committed by Android (Google) Code Review
Browse files

Merge "Remove ContactDetailLayoutController's social code"

parents dd64061d cb89f71e

res/layout-land/contact_detail_container.xml

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

<!-- Copyright (C) 2011 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.

-->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <com.android.contacts.detail.ContactDetailFragmentCarousel

        android:id="@+id/fragment_carousel"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>



</FrameLayout>
 
 No newline at end of file

res/layout-sw600dp-land/contact_detail_container.xml

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

<!-- Copyright (C) 2012 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.

-->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <com.android.contacts.detail.ContactDetailFragmentCarousel

        android:id="@+id/fragment_carousel"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginLeft="16dip"

        android:layout_marginStart="16dip"/>



</FrameLayout>

res/layout-sw600dp-land/detail_header_contact_with_updates.xml

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

<!-- Copyright (C) 2012 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.

-->



<!--

  This is a header entry in the contact details list for when the contact has social updates. The

  entry shows the contact's basic info and maintains vertical padding to ensure that the first

  contact detail is visible (and below the tab carousel). The photo is not displayed here

  because it will be shown in the tab carousel.

-->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingBottom="8dip"

    android:orientation="horizontal">



    <include layout="@layout/photo_selector_view"

        android:layout_width="@dimen/detail_contact_photo_size"

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



    <LinearLayout

        android:layout_width="0dip"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="vertical"

        android:paddingLeft="16dip"

        android:paddingRight="4dip"

        android:paddingStart="16dip"

        android:paddingEnd="4dip">



        <TextView

            android:id="@+id/name"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_vertical"

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

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



        <TextView

            android:id="@+id/company"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center_vertical"

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

            android:textColor="?android:attr/textColorSecondary" />



    </LinearLayout>



    <include

        layout="@layout/favorites_star" />



</LinearLayout>

res/layout-sw600dp/contact_detail_container.xml

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

<!-- Copyright (C) 2011 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.

-->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <android.support.v4.view.ViewPager

        android:id="@+id/pager"

        android:layout_alignParentTop="true"

        android:layout_alignParentLeft="true"

        android:layout_alignParentStart="true"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <include

        android:id="@+id/tab_carousel"

        layout="@layout/contact_detail_tab_carousel"

        android:layout_alignParentTop="true"

        android:layout_alignParentLeft="true"

        android:layout_alignParentStart="true"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:visibility="gone"/>



</RelativeLayout>
 
 No newline at end of file

res/layout-sw600dp/detail_header_contact_with_updates.xml

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

<!-- Copyright (C) 2011 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.

-->



<!--

  This is a header entry in the contact details list for when the contact has social updates. The

  entry shows the contact's basic info and maintains vertical padding to ensure that the first

  contact detail is visible (and below the tab carousel). The photo is not displayed here

  because it will be shown in the tab carousel.

-->

<LinearLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:layout_marginTop="30dip"

    android:paddingBottom="16dip">



    <!-- Add a first item that gives us enough space to show the carousel -->

    <view

        class="com.android.contacts.common.widget.ProportionalLayout"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        ex:ratio="0.6667"

        ex:direction="widthToHeight">



        <!-- Put a dummy view here because the ProportionalLayout requires one -->

        <View

            android:layout_width="match_parent"

            android:layout_height="match_parent" />



    </view>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingTop="8dip"

        android:paddingEnd="8dip" >



        <TextView

            android:id="@+id/name"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:paddingStart="8dip"

            android:paddingEnd="24dip"

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

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



        <include

            layout="@layout/favorites_star" />



    </LinearLayout>



    <TextView

        android:id="@+id/company"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="8dip"

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

        android:textColor="?android:attr/textColorSecondary" />



</LinearLayout>