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

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

Merge "Fix tablet picker layout." into ics-mr1

parents 5518e0e9 594dc44c

res/layout-sw580dp/contact_picker.xml

+20 −11
Original line number Diff line number Diff line
@@ -14,19 +14,20 @@ 
     limitations under the License.

-->



<view

<LinearLayout

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

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

    style="@style/ContactPickerLayout"

    android:orientation="vertical"

    android:layout_height="match_parent">

    <!-- Right bound should be aligned to ListView's right edge. -->

    <view

        class="android.widget.SearchView"

        android:id="@+id/search_view"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="0dip"

        android:layout_marginRight="32dip"

        android:layout_marginRight="@dimen/list_visible_scrollbar_padding"

        android:paddingRight="0dip"

        android:iconifiedByDefault="false" />

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

    <FrameLayout
@@ -35,18 +36,26 @@ 
        android:layout_height="0dip"

        android:layout_weight="1" />



    <!-- This should look like a menu on the split action bar. -->

    <LinearLayout

        style="?android:attr/buttonBarStyle"

        android:id="@+id/new_contact"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="48dip"

        android:background="@drawable/gray_action_bar_background"

        android:paddingLeft="16dip"

        android:paddingRight="16dip">

        <Button

            android:id="@+id/new_contact"

            style="?android:attr/buttonBarButtonStyle"

            android:layout_width="match_parent"

        <TextView

            android:id="@android:id/title"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:textAllCaps="true"

            android:layout_weight="1"

            android:layout_gravity="center"

            android:gravity="center"

            android:duplicateParentState="true"

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

            android:textColor="@color/action_bar_button_text_color"

            style="@android:style/Widget.Holo.ActionBar.TabText"

            android:text="@string/pickerNewContactText"/>

    </LinearLayout>

</view>
 
</LinearLayout>

res/layout/group_source_button.xml

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

    android:layout_height="wrap_content"

    android:minHeight="48dip"

    android:background="@drawable/group_source_button_background"

    android:background="@drawable/gray_action_bar_background"

    android:paddingLeft="16dip"

    android:paddingRight="16dip" >

res/layout/join_contact_picker_list_content.xml

+4 −3
Original line number Diff line number Diff line
@@ -19,15 +19,16 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="16dip"

    android:orientation="vertical">



    <TextView

        android:id="@+id/join_contact_blurb"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"

        android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"

        android:layout_marginLeft="@dimen/join_header_left_margin"

        android:layout_marginTop="@dimen/join_header_top_margin"

        android:layout_marginRight="@dimen/join_header_right_margin"

        android:layout_marginBottom="@dimen/join_header_bottom_margin"

        android:paddingLeft="?attr/list_item_header_text_indent"

        android:maxLines="2"

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

res/layout/join_contact_picker_section_header.xml

+3 −13
Original line number Diff line number Diff line
@@ -20,19 +20,9 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <TextView

        android:id="@+id/text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="32dip"

        android:paddingLeft="?attr/list_item_header_text_indent"

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

        android:textAllCaps="true"

        android:textStyle="bold"

        android:singleLine="true"

        android:ellipsize="end"

        android:gravity="center_vertical" />



    <View style="@style/SectionDivider" />

        style="@style/ContactListSeparatorTextViewStyle"

        android:paddingLeft="8dip"

        android:paddingRight="8dip" />

</LinearLayout>