Merge branch 'master' into 'master'

Fixed long version overriding app name (issue #322)

Also, fixed deprecated "singleLine" property to "maxLines="1"".
Also removed reduntant (legacy) padding declarations, for the files used exclusively by newer APIs which override those declarations with new ones.

See merge request !417
This commit is contained in:
Peter Serwylo 2016-11-16 21:39:24 +00:00
commit 43303d17cc
2 changed files with 8 additions and 12 deletions

View File

@ -36,14 +36,11 @@
<TextView android:id="@+id/name"
android:textSize="16sp"
android:singleLine="true"
android:maxLines="1"
android:ellipsize="end"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingStart="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingEnd="?attr/listPreferredItemPaddingRight"
android:layout_gravity="center_vertical"
android:gravity="start"
@ -52,10 +49,10 @@
<TextView android:id="@+id/status"
android:textSize="14sp"
android:singleLine="true"
android:maxLines="1"
android:ellipsize="end"
android:layout_weight="0"
android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="end"

View File

@ -34,9 +34,8 @@
<TextView android:id="@+id/name"
android:textSize="16sp"
android:singleLine="true"
android:maxLines="1"
android:ellipsize="end"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
@ -50,10 +49,10 @@
<TextView android:id="@+id/status"
android:textSize="14sp"
android:singleLine="true"
android:maxLines="1"
android:ellipsize="end"
android:layout_weight="0"
android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="end"