diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-06 17:35:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-06-06 17:35:30 +0000 |
| commit | e6cb51db7662b9aed34f8906d69a89b36f3d9b19 (patch) | |
| tree | fa4985247c8777e99c26cac15b2a525b4c22483b /res | |
| parent | 9fa2cf56f90a20bcf41d6ec2c23d8e0dd3b51cca (diff) | |
| parent | 916d68c1d1da81b771e945a27dfb3ea6cd35ebd3 (diff) | |
| download | android_packages_apps_Dialer-e6cb51db7662b9aed34f8906d69a89b36f3d9b19.tar.gz android_packages_apps_Dialer-e6cb51db7662b9aed34f8906d69a89b36f3d9b19.tar.bz2 android_packages_apps_Dialer-e6cb51db7662b9aed34f8906d69a89b36f3d9b19.zip | |
Merge "Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE" into cm-11.0
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/phone_favorites_fragment.xml | 1 | ||||
| -rw-r--r-- | res/layout/phone_no_favorites.xml | 14 |
2 files changed, 4 insertions, 11 deletions
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" |