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

Commit 0147c3ba authored by Zheng Fu's avatar Zheng Fu Committed by Android (Google) Code Review
Browse files

Merge "Add padding to join contact list view" into lmp-dev

parents b51224ad 03003861

res/layout-sw600dp/contact_list_content.xml

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

<!-- Copyright (C) 2014 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:id="@+id/pinned_header_list_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal">

        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="@integer/people_activity_space_layout_weight"

            android:background="@color/background_primary"/>

        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:background="@color/contact_all_list_background_color"

            android:layout_weight="@integer/people_activity_list_view_layout_weight"

            android:elevation="@dimen/people_activity_card_elevation"/>

        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="@integer/people_activity_space_layout_weight"

            android:background="@color/background_primary"/>

    </LinearLayout>

    <LinearLayout

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <!-- Shown only when an Account filter is set.

             - paddingTop should be here to show "shade" effect correctly. -->

        <include

            android:id="@+id/account_filter_header_container"

            layout="@layout/account_filter_header" />



        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="0dip"

            android:layout_weight="1" >

            <view

                class="com.android.contacts.common.list.PinnedHeaderListView"

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

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_marginLeft="?attr/contact_browser_list_padding_left"

                android:layout_marginRight="?attr/contact_browser_list_padding_right"

                android:layout_marginStart="?attr/contact_browser_list_padding_left"

                android:layout_marginEnd="?attr/contact_browser_list_padding_right"

                android:fastScrollEnabled="true"

                android:fadingEdge="none" />

            <ProgressBar

                android:id="@+id/search_progress"

                style="?android:attr/progressBarStyleLarge"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:visibility="gone" />

        </FrameLayout>

    </LinearLayout>

</FrameLayout>

res/layout-sw600dp/contact_tile_list.xml

deleted100644 → 0
+0 −64
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"

    android:paddingBottom="?attr/favorites_padding_bottom">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal">

        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="@integer/people_activity_space_layout_weight"

            android:background="@color/background_primary"/>

        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:background="@color/contact_favorites_list_background_color"

            android:layout_weight="@integer/people_activity_list_view_layout_weight"

            android:elevation="@dimen/people_activity_card_elevation"/>

        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="@integer/people_activity_space_layout_weight"

            android:background="@color/background_primary"/>

    </LinearLayout>

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <ListView

            android:id="@+id/contact_tile_list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingTop="@dimen/contact_tile_list_padding_top"

            android:clipToPadding="false"

            android:fadingEdge="none"

            android:divider="@null"

            android:scrollbarStyle="outsideOverlay"/>

        <TextView

            android:id="@+id/contact_tile_list_empty"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center_horizontal"

            android:layout_marginTop="@dimen/empty_message_top_margin"

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

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

    </FrameLayout>

</FrameLayout>

res/layout-sw600dp/contacts_unavailable_fragment.xml

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

<!-- Copyright (C) 2014 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"

    android:paddingBottom="?attr/favorites_padding_bottom">

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal">

        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="@integer/people_activity_space_layout_weight"

            android:background="@color/background_primary"/>

        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:background="@color/contact_favorites_list_background_color"

            android:layout_weight="@integer/people_activity_list_view_layout_weight"

            android:elevation="@dimen/people_activity_card_elevation"/>

        <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="@integer/people_activity_space_layout_weight"

            android:background="@color/background_primary"/>

    </LinearLayout>

    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fillViewport="true">

        <include layout="@layout/contacts_unavailable_fragment_content"/>

    </ScrollView>

</FrameLayout>

res/layout/contact_picker_content.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
             android:layout_width="match_parent"

             android:layout_height="match_parent">



    <include layout="@layout/contact_list_card"/>



    <view

        class="com.android.contacts.common.list.PinnedHeaderListView"

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

res/layout/contact_tile_list.xml

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
    android:paddingBottom="?attr/favorites_padding_bottom"

    android:background="@color/background_primary">



    <include layout="@layout/contact_list_card"/>



    <ListView

        android:id="@+id/contact_tile_list"

        android:layout_width="match_parent"
@@ -28,7 +30,8 @@ 
        android:paddingTop="@dimen/contact_tile_list_padding_top"

        android:clipToPadding="false"

        android:fadingEdge="none"

        android:divider="@null" />

        android:divider="@null"

        android:scrollbarStyle="outsideOverlay"/>



    <TextView

        android:id="@+id/contact_tile_list_empty"