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

Commit 0d39c554 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android (Google) Code Review
Browse files

Merge "Contact picker/group list pixel-perfect"

parents a10732cd 08c87460

res/layout/contact_detail_list_item.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:gravity="center_vertical"

    android:paddingTop="12dip"

    android:paddingBottom="12dip"

    android:paddingTop="8dip"

    android:paddingBottom="8dip"

    android:minHeight="@dimen/detail_min_line_item_height">



    <!-- Note: padding might be controlled programatically -->

res/layout-sw580dp/contact_picker_content.xml→res/layout/contact_detail_list_padding.xml

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

<!-- Copyright (C) 2008 The Android Open Source Project

<!-- 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.
@@ -14,30 +14,15 @@ 
     limitations under the License.

-->



<LinearLayout

<!-- The actual padding is embedded in a FrameLayout since we cannot change the

     visibility of a header view in a ListView without having a parent view. -->

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    android:layout_height="wrap_content">

    <View

        android:id="@+id/contact_detail_list_padding"

        android:layout_width="match_parent"

        android:layout_height="2dip"

        android:layout_marginTop="1dip"

        android:layout_marginBottom="1dip"

        android:background="#7e7e87" />



    <view

        class="com.android.contacts.list.ContactEntryListView"

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

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:fastScrollEnabled="true"

        android:layout_weight="1"/>

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

</FrameLayout>

    <ViewStub

        android:id="@+id/footer_stub"

        android:layout="@layout/footer_panel"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content" />

</LinearLayout>

res/layout/contact_picker.xml

+9 −9
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    class="com.android.contacts.widget.FullHeightLinearLayout"

    style="@style/ContactPickerLayout"

    android:paddingLeft="8dip"

    android:paddingRight="8dip"

    android:orientation="vertical"

    android:layout_height="match_parent">

    <view
@@ -27,18 +25,18 @@ 
        android:id="@+id/search_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="10dip"

        android:layout_marginRight="10dip"

        android:layout_marginBottom="10dip"

        android:layout_marginLeft="0dip"

        android:layout_marginRight="32dip"

        android:iconifiedByDefault="false" />

    <!-- will contain an appropriate contacts list -->

    <FrameLayout

        android:id="@+id/list_container"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1"

        android:id="@+id/list_container">

    </FrameLayout>

        android:layout_weight="1" />



    <View

        android:id="@+id/divider"

        android:layout_width="match_parent"

        android:layout_height="1dip"

        android:layout_marginLeft="16dip"
@@ -48,7 +46,9 @@ 
    <LinearLayout

        style="?android:attr/buttonBarStyle"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        android:layout_height="wrap_content"

        android:paddingLeft="16dip"

        android:paddingRight="16dip">

        <Button

            style="?android:attr/buttonBarButtonStyle"

            android:id="@+id/cancel"

res/layout/contact_picker_content.xml

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
        android:id="@android:id/list"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_marginLeft="?attr/contact_browser_list_padding_left"

        android:layout_marginRight="?attr/contact_browser_list_padding_right"

        android:fastScrollEnabled="true"

        android:layout_weight="1" />

res/layout/contacts_list_content.xml

+7 −7
Original line number Diff line number Diff line
@@ -22,17 +22,19 @@ 
<LinearLayout

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

    android:id="@+id/pinned_header_list_layout"

    android:paddingTop="@dimen/contact_browser_list_top_margin"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent" >



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

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

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

    <LinearLayout

        android:id="@+id/account_filter_header_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="?attr/list_item_header_height"

        android:orientation="vertical"

        android:paddingTop="@dimen/contact_browser_list_top_margin"

        android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"

        android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"

        android:visibility="gone">
@@ -40,11 +42,9 @@ 
            android:id="@+id/account_filter_header"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/contact_filter_header_min_height"

            android:singleLine="true"

            android:ellipsize="end"

            android:textStyle="bold"

            android:gravity="left|center_vertical"

            android:textAllCaps="true"

            android:paddingLeft="@dimen/contact_browser_list_item_text_indent"

            android:textAppearance="?android:attr/textAppearanceSmall"
@@ -60,8 +60,8 @@ 
        android:id="@android:id/list"

        android:layout_width="match_parent"

        android:layout_height="0dip"

           android:layout_marginLeft="@dimen/contact_browser_list_left_margin"

        android:layout_marginRight="@dimen/contact_browser_list_right_margin"

        android:layout_marginLeft="?attr/contact_browser_list_padding_left"

        android:layout_marginRight="?attr/contact_browser_list_padding_right"

        android:fastScrollEnabled="true"

        android:layout_weight="1" />