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

Commit 13f6f26c authored by Maurice Chu's avatar Maurice Chu
Browse files

Change contact detail on 7" to fragment carousel 

Contact details in 7" landscape uses the fragment
carousel to show details with updates.  The layout
of the contact details fragment follows the 10"
landscape contact details fragment layout.  Dimming
of the detail or updates panel in the fragment
carousel has been disabled, and to be consistent,
this dimming is also disabled on the phone landscape
layout.

Also, this changes fixes the bug with the overscroll
indicators in the contact details pane.

Bug: 6398940
Bug: 6378743
Change-Id: Ie93ab73a9ebad8b66f5bc7d75222f5550ed1b005
parent c0b1bf50

res/layout-sw580dp-w940dp/contact_detail_container.xml

0 → 100644
+27 −0
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"/>



</FrameLayout>

res/layout-sw580dp-w940dp/contact_detail_fragment.xml

0 → 100644
+67 −0
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.

-->



<LinearLayout

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

    android:id="@+id/contact_detail"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/background_primary"

    android:paddingRight="16dip">



    <!-- Placeholder for empty list -->

    <include

        android:id="@android:id/empty"

        layout="@layout/contact_detail_empty"

        android:visibility="gone" />



    <!-- Real list -->

    <LinearLayout

        android:orientation="horizontal"

        android:layout_weight="1"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:baselineAligned="false">



        <include android:id="@+id/static_photo_container"

            layout="@layout/photo_selector_view"

            android:layout_width="@dimen/detail_contact_photo_size"

            android:layout_height="@dimen/detail_contact_photo_size"

            android:layout_marginTop="@dimen/detail_contact_photo_margin"

            android:layout_marginRight="@dimen/detail_contact_photo_margin" />



        <ListView android:id="@android:id/list"

            android:layout_width="0dip"

            android:layout_height="match_parent"

            android:paddingTop="16dip"

            android:clipToPadding="false"

            android:fadingEdge="none"

            android:layout_weight="1"

            android:divider="@null"/>



    </LinearLayout>



    <!-- "QuickFix"- button (Copy to local contact, add to group) -->

    <Button

        android:id="@+id/contact_quick_fix"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:visibility="gone"

        android:layout_gravity="center"

        android:layout_marginTop="10dip"

        android:layout_marginBottom="10dip" />

</LinearLayout>

res/layout-sw580dp-w940dp/contact_detail_updates_fragment.xml

0 → 100644
+27 −0
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.

-->



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

    android:id="@android:id/list"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/background_social_updates"

    android:fadingEdge="none"

    android:divider="@null"

    android:paddingTop="@dimen/contact_detail_list_top_padding"

    android:paddingLeft="16dip"

    android:paddingRight="16dip"

    android:clipToPadding="false"/>

res/layout-sw580dp-w940dp/detail_header_contact_with_updates.xml

0 → 100644
+63 −0
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">



        <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-sw580dp-w940dp/detail_header_contact_without_updates.xml

0 → 100644
+56 −0
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 does not have social

  updates, which means that the contact's basic info will scroll with the list of details. The

  photo is not included because it will be displayed in a static place elsewhere.

-->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingLeft="8dip"

    android:paddingBottom="16dip"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingRight="16dip">



        <TextView

            android:id="@+id/name"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_height="wrap_content"

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

            android:textSize="@dimen/detail_header_name_text_size"

            android:paddingRight="16dip" />



        <include

            layout="@layout/favorites_star" />



    </LinearLayout>



    <TextView

        android:id="@+id/company"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

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

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



</LinearLayout>