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

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

Merge "Remove top padding for usual account headers" into ics-mr1

parents 434d05a9 b5c0b93e

res/layout/account_filter_header.xml

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

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:paddingTop="@dimen/contact_browser_list_top_margin"

    android:paddingTop="@dimen/account_filter_header_top_padding"

    android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"

    android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"

    android:background="?android:attr/selectableItemBackground"

res/layout/account_filter_header_for_phone_favorite.xml

0 → 100644
+36 −0
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.

-->



<!-- Layout showing the type of account filter for phone favorite screen

     (or, new phone "all" screen).

     This is very similar to account_filter_header.xml but different in its

     top padding. -->

<LinearLayout

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

    android:id="@+id/account_filter_header_container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:paddingTop="8dip"

    android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"

    android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"

    android:background="?android:attr/selectableItemBackground"

    android:visibility="gone">

    <TextView

        android:id="@+id/account_filter_header"

        style="@style/ContactListSeparatorTextViewStyle"

        android:paddingLeft="@dimen/contact_browser_list_item_text_indent" />

</LinearLayout>

res/values-sw580dp/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
    <dimen name="contact_browser_list_header_left_margin">@dimen/list_visible_scrollbar_padding</dimen>

    <dimen name="contact_browser_list_header_right_margin">24dip</dimen>

    <dimen name="list_visible_scrollbar_padding">48dip</dimen>

    <dimen name="account_filter_header_top_padding">@dimen/contact_browser_list_top_margin</dimen>



    <!-- Margins and padding for text in widget -->

    <dimen name="widget_snippet_top_margin">5dip</dimen>

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,8 @@ 
    <dimen name="contact_browser_list_item_text_indent">8dip</dimen>

    <dimen name="contact_browser_list_top_margin">8dip</dimen>



    <dimen name="account_filter_header_top_padding">0dip</dimen>



    <!-- ContactTile Layouts -->

    <!--

      Use sp instead of dip so that the shadowbox heights can all scale uniformly

src/com/android/contacts/list/PhoneFavoriteFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -304,7 +304,8 @@ public class PhoneFavoriteFragment extends Fragment implements OnItemClickListen 


        // Create the account filter header but keep it hidden until "all" contacts are loaded.

        mAccountFilterHeaderContainer = new FrameLayout(context, null);

        mAccountFilterHeader = inflater.inflate(R.layout.account_filter_header, mListView, false);

        mAccountFilterHeader = inflater.inflate(R.layout.account_filter_header_for_phone_favorite,

                mListView, false);

        mAccountFilterHeader.setOnClickListener(mFilterHeaderClickListener);

        mAccountFilterHeaderContainer.addView(mAccountFilterHeader);

        mAccountFilterHeaderContainer.setVisibility(View.GONE);