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

Commit 2a50519e authored by Katherine Kuan's avatar Katherine Kuan Committed by Android (Google) Code Review
Browse files

Merge "Scroll content to edges of screen on tablet" into ics-mr1

parents 724f4c27 1fa0de90

res/layout-sw580dp-w1000dp/contact_detail_fragment.xml

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

    android:layout_height="match_parent"

    android:background="@color/background_primary"

    android:padding="16dip">

    android:paddingLeft="16dip"

    android:paddingRight="16dip">



    <!-- Placeholder for empty list -->

    <include
@@ -41,11 +42,14 @@ 
            android:scaleType="centerCrop"

            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"/>

res/layout-sw580dp-w1000dp/people_activity.xml

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ 
                        class="com.android.contacts.list.ContactTileListFragment"

                        android:layout_height="match_parent"

                        android:layout_width="match_parent"

                        android:layout_marginTop="32dip"

                        android:layout_marginRight="32dip"

                        android:layout_marginLeft="32dip"/>

res/layout-sw580dp/people_activity.xml

+5 −6
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
                <FrameLayout

                    android:layout_width="0dip"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:layout_weight="10"

                    android:background="@drawable/panel_favorites_holo_light">



                    <fragment
@@ -125,9 +125,8 @@ 
                        class="com.android.contacts.list.ContactTileListFragment"

                        android:layout_height="match_parent"

                        android:layout_width="match_parent"

                        android:layout_marginTop="32dip"

                        android:layout_marginRight="32dip"

                        android:layout_marginLeft="32dip"/>

                        android:layout_marginRight="16dip"

                        android:layout_marginLeft="16dip"/>



                </FrameLayout>
@@ -137,8 +136,8 @@ 
                    class="com.android.contacts.list.ContactTileListFragment"

                    android:layout_width="0dip"

                    android:layout_height="match_parent"

                    android:layout_weight="1"

                    android:layout_marginTop="32dip"

                    android:layout_weight="8"

                    android:layout_marginTop="16dip"

                    android:layout_marginRight="16dip"/>



            </LinearLayout>

res/layout/contact_tile_list.xml

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
        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" />

res/values-sw580dp-w1000dp/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,4 +18,5 @@ 
    <dimen name="group_detail_side_margin">32dip</dimen>

    <dimen name="detail_contact_photo_margin">16dip</dimen>

    <dimen name="contact_detail_list_top_padding">32dip</dimen>

    <dimen name="contact_tile_list_padding_top">32dip</dimen>

</resources>