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

Commit e643fc2b authored by Zheng Fu's avatar Zheng Fu Committed by Android Git Automerger
Browse files

am 319e7810: Merge "Adding common contact list view and card layout" into lmp-dev 

* commit '319e7810d994f0332555c92314277258db5d7fba':
  Adding common contact list view and card layout
parents 18283e62 57a0bdd5

res-common/layout/contact_list_card.xml

0 → 100644
+39 −0
Original line number Original line 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.

-->

<LinearLayout

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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:id="@+id/list_card"

        android:visibility="invisible">

    <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="@integer/contact_list_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/contact_list_card_layout_weight"

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

    <View

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="@integer/contact_list_space_layout_weight"

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

</LinearLayout>

res-common/layout/contact_list_content.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ 
        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_height="0dip"

        android:layout_weight="1" >

        android:layout_weight="1" >

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

        <view

        <view

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

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

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

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

res-common/layout/contact_tile_starred.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:paddingTop="7dp"

            android:paddingTop="7dp"

            android:textColor="#202020"

            android:textColor="#202020"

            android:textSize="16sp"

            android:textSize="@dimen/contact_browser_list_item_text_size"

            android:singleLine="true"

            android:singleLine="true"

            android:fadingEdge="horizontal"

            android:fadingEdge="horizontal"

            android:fadingEdgeLength="3dip"

            android:fadingEdgeLength="3dip"

res-common/layout/list_separator.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,4 +24,4 @@ 
    android:paddingBottom="15dip"

    android:paddingBottom="15dip"

    android:paddingTop="16dip"

    android:paddingTop="16dip"

    android:textStyle="bold"

    android:textStyle="bold"

    android:textSize="24sp"/>
 
    android:textSize="@dimen/frequently_contacted_title_text_size"/>

res-common/values/colors.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -146,4 +146,8 @@ 




    <color name="search_shortcut_background_color">#b6b6b6</color>

    <color name="search_shortcut_background_color">#b6b6b6</color>

    <color name="search_shortcut_icon_color">#f8f8f8</color>

    <color name="search_shortcut_icon_color">#f8f8f8</color>



    <!-- Color of the background of the contact detail and editor pages -->

    <color name="background_primary">#f5f5f5</color>

    <color name="contact_all_list_background_color">#FFFFFF</color>

</resources>
 
</resources>