From e01ec5f3e8471850929e0c7bb1831922b5fed274 Mon Sep 17 00:00:00 2001
From: aleksandar-stefanovic <theonewithideas@gmail.com>
Date: Wed, 16 Nov 2016 21:46:55 +0100
Subject: [PATCH] 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.
---
 app/src/main/res/layout-v21/applistitem.xml | 11 ++++-------
 app/src/main/res/layout/applistitem.xml     |  9 ++++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout-v21/applistitem.xml b/app/src/main/res/layout-v21/applistitem.xml
index d269e6b95..9f45beab6 100644
--- a/app/src/main/res/layout-v21/applistitem.xml
+++ b/app/src/main/res/layout-v21/applistitem.xml
@@ -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"
diff --git a/app/src/main/res/layout/applistitem.xml b/app/src/main/res/layout/applistitem.xml
index 4101232ac..aed8e85e0 100644
--- a/app/src/main/res/layout/applistitem.xml
+++ b/app/src/main/res/layout/applistitem.xml
@@ -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"