diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-03-06 23:58:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-06 23:58:55 +0000 |
| commit | a1d699ba66c98a38dde881db7d35bd5b8a176c78 (patch) | |
| tree | e43efcd06175eaf41c8c8b6718fd03ba10c928ec /res | |
| parent | 0b218533ebcc865b9765db831c4541aee5954d6d (diff) | |
| parent | 6b55340d79f41e65dae7327f9a9a90d3092fb5ca (diff) | |
Merge "Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE" into klp-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/dialtacts_activity.xml | 6 | ||||
| -rw-r--r-- | res/layout/phone_favorites_fragment.xml | 1 | ||||
| -rw-r--r-- | res/layout/phone_no_favorites.xml | 14 |
3 files changed, 10 insertions, 11 deletions
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml index 8f9f39cd2..6eea63350 100644 --- a/res/layout/dialtacts_activity.xml +++ b/res/layout/dialtacts_activity.xml @@ -140,6 +140,12 @@ android:layout_alignParentRight="true" /> </RelativeLayout> + <Space + android:id="@+id/contact_tile_frame_spacer" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_alignParentBottom="true" + android:visibility="gone"/> </LinearLayout> </FrameLayout> diff --git a/res/layout/phone_favorites_fragment.xml b/res/layout/phone_favorites_fragment.xml index 23987a813..d1ff3d75a 100644 --- a/res/layout/phone_favorites_fragment.xml +++ b/res/layout/phone_favorites_fragment.xml @@ -58,5 +58,4 @@ android:layout_alignParentBottom="true" layout="@layout/phone_no_favorites" android:visibility="gone"/> - </RelativeLayout> diff --git a/res/layout/phone_no_favorites.xml b/res/layout/phone_no_favorites.xml index 1a0079f52..b95afd197 100644 --- a/res/layout/phone_no_favorites.xml +++ b/res/layout/phone_no_favorites.xml @@ -18,7 +18,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:minHeight="?android:attr/listPreferredItemHeight"> <include @@ -33,23 +32,18 @@ <LinearLayout android:id="@+id/nofavorite_frame" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:orientation="vertical" - android:layout_gravity="center" android:gravity="center" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:layout_above="@id/show_all_contact_button_in_nofav"> - + android:layout_centerInParent="true"> <ImageView android:id="@+id/nofavorite_image" android:layout_height="wrap_content" android:layout_width="match_parent" android:gravity="center_horizontal" android:src="@drawable/no_favorites_banner" - android:layout_marginBottom="14dp"/> - + android:layout_marginBottom="14dp" + android:contentDescription="@string/no_favorites"/> <TextView android:id="@+id/title" android:layout_width="match_parent" |