From 21d1c56e4d22465954de25f05ca9d20949e07adf Mon Sep 17 00:00:00 2001
From: AndyScherzinger <info@andy-scherzinger.de>
Date: Mon, 7 Aug 2017 17:33:23 +0200
Subject: [PATCH] fix Combining Ellipsize and Maxlines (lint)

---
 src/main/res/layout/activity_row.xml                 |  2 +-
 src/main/res/layout/contactlist_list_item.xml        |  2 +-
 src/main/res/layout/edit_share_layout.xml            |  2 +-
 src/main/res/layout/file_details_share_user_item.xml |  2 +-
 src/main/res/layout/grid_item.xml                    |  3 +--
 src/main/res/layout/list_item.xml                    |  2 +-
 .../res/layout/notification_with_progress_bar.xml    |  4 ++--
 src/main/res/layout/share_file_layout.xml            |  2 +-
 src/main/res/layout/share_user_item.xml              |  2 +-
 src/main/res/layout/sorting_order_fragment.xml       | 12 ++++++------
 .../res/layout/synced_folders_settings_layout.xml    |  8 ++++----
 src/main/res/layout/upload_list_item.xml             |  6 +++---
 src/main/res/layout/uploader_list_item_layout.xml    |  2 +-
 13 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/main/res/layout/activity_row.xml b/src/main/res/layout/activity_row.xml
index f25e5a0bdd..ea8eabf035 100644
--- a/src/main/res/layout/activity_row.xml
+++ b/src/main/res/layout/activity_row.xml
@@ -50,7 +50,7 @@
             android:layout_gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
             android:duplicateParentState="true"
-			android:maxLines="1"
+			android:singleLine="true"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal" />
 
diff --git a/src/main/res/layout/contactlist_list_item.xml b/src/main/res/layout/contactlist_list_item.xml
index 6d5ad5ed38..48a6e1e16e 100644
--- a/src/main/res/layout/contactlist_list_item.xml
+++ b/src/main/res/layout/contactlist_list_item.xml
@@ -39,7 +39,7 @@
         android:checkMark="?android:attr/listChoiceIndicatorMultiple"
         android:ellipsize="marquee"
         android:gravity="center_vertical"
-        android:maxLines="1"
+        android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceListItem"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/edit_share_layout.xml b/src/main/res/layout/edit_share_layout.xml
index cd4a898c18..a1ecd73486 100644
--- a/src/main/res/layout/edit_share_layout.xml
+++ b/src/main/res/layout/edit_share_layout.xml
@@ -34,7 +34,7 @@
             android:text="@string/share_with_edit_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:padding="@dimen/standard_padding"
-            android:maxLines="1"
+            android:singleLine="true"
             android:ellipsize="middle"
             />
 
diff --git a/src/main/res/layout/file_details_share_user_item.xml b/src/main/res/layout/file_details_share_user_item.xml
index 9c7fed9ca2..16f59de855 100644
--- a/src/main/res/layout/file_details_share_user_item.xml
+++ b/src/main/res/layout/file_details_share_user_item.xml
@@ -35,7 +35,7 @@
             android:text="@string/username"
             android:id="@+id/userOrGroupName"
             android:layout_margin="12dp"
-            android:maxLines="1"
+            android:singleLine="true"
             android:ellipsize="middle"
             android:textColor="@color/black"/>
 </LinearLayout>
diff --git a/src/main/res/layout/grid_item.xml b/src/main/res/layout/grid_item.xml
index 4ae0df1980..ab2a0fd75e 100644
--- a/src/main/res/layout/grid_item.xml
+++ b/src/main/res/layout/grid_item.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ownCloud Android client application
   Copyright (C) 2015 ownCloud Inc.
@@ -94,7 +93,7 @@
         android:layout_marginRight="@dimen/standard_quarter_margin"
         android:ellipsize="middle"
         android:gravity="center_horizontal"
-        android:maxLines="1"
+        android:singleLine="true"
         android:text="@string/placeholder_filename"
         android:textColor="@color/textColor"
         android:textSize="@dimen/grid_item_text_size" />
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 43d3f897d3..03fea0d2e1 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -94,7 +94,7 @@
                 android:layout_marginLeft="@dimen/zero"
                 android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:ellipsize="middle"
-                android:maxLines="1"
+                android:singleLine="true"
                 android:text="@string/placeholder_filename"
                 android:textColor="@color/textColor"
                 android:textSize="@dimen/two_line_primary_text_size" />
diff --git a/src/main/res/layout/notification_with_progress_bar.xml b/src/main/res/layout/notification_with_progress_bar.xml
index 7d7dd8383d..79588e6e89 100644
--- a/src/main/res/layout/notification_with_progress_bar.xml
+++ b/src/main/res/layout/notification_with_progress_bar.xml
@@ -36,7 +36,7 @@
 		<TextView android:id="@+id/title"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-				  android:maxLines="1"
+			android:singleLine="true"
 			android:ellipsize="marquee"
             android:fadingEdge="horizontal"
             style="@style/Theme.ownCloud.NotificationText.Title"
@@ -46,7 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/standard_eighth_margin_negative"
             android:layout_marginBottom="@dimen/standard_eighth_margin_negative"
-				  android:maxLines="1"
+			android:singleLine="true"
             android:fadingEdge="horizontal"
             android:ellipsize="marquee"
             style="@style/Theme.ownCloud.NotificationText.Content"
diff --git a/src/main/res/layout/share_file_layout.xml b/src/main/res/layout/share_file_layout.xml
index 50c05ed75d..f99b298096 100644
--- a/src/main/res/layout/share_file_layout.xml
+++ b/src/main/res/layout/share_file_layout.xml
@@ -54,7 +54,7 @@
                 android:layout_toEndOf="@+id/shareFileIcon"
                 android:layout_toRightOf="@+id/shareFileIcon"
                 android:ellipsize="middle"
-                android:maxLines="1"
+                android:singleLine="true"
                 android:text="@string/placeholder_filename"
                 android:textColor="@color/black"
                 android:textSize="@dimen/two_line_primary_text_size"/>
diff --git a/src/main/res/layout/share_user_item.xml b/src/main/res/layout/share_user_item.xml
index 5c579f6c19..df68b54c9e 100644
--- a/src/main/res/layout/share_user_item.xml
+++ b/src/main/res/layout/share_user_item.xml
@@ -44,7 +44,7 @@
             android:layout_marginBottom="@dimen/standard_half_margin"
             android:layout_marginLeft="@dimen/standard_half_margin"
             android:textColor="@color/textColor"
-            android:maxLines="1"
+            android:singleLine="true"
             android:ellipsize="middle"
             android:layout_gravity="center_vertical"/>
 
diff --git a/src/main/res/layout/sorting_order_fragment.xml b/src/main/res/layout/sorting_order_fragment.xml
index ada19ca897..f70c8ddcda 100644
--- a/src/main/res/layout/sorting_order_fragment.xml
+++ b/src/main/res/layout/sorting_order_fragment.xml
@@ -67,7 +67,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
                     android:ellipsize="middle"
-                    android:maxLines="1"
+                    android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
@@ -100,7 +100,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
                     android:ellipsize="middle"
-                    android:maxLines="1"
+                    android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
@@ -134,7 +134,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
                     android:ellipsize="middle"
-                    android:maxLines="1"
+                    android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
@@ -167,7 +167,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
                     android:ellipsize="middle"
-                    android:maxLines="1"
+                    android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
@@ -202,7 +202,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
                     android:ellipsize="middle"
-                    android:maxLines="1"
+                    android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
@@ -235,7 +235,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
                     android:ellipsize="middle"
-                    android:maxLines="1"
+                    android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
                     android:paddingRight="@dimen/standard_double_padding"
                     android:paddingTop="@dimen/standard_half_padding"
diff --git a/src/main/res/layout/synced_folders_settings_layout.xml b/src/main/res/layout/synced_folders_settings_layout.xml
index 7c5fe6cf15..5f036c492d 100644
--- a/src/main/res/layout/synced_folders_settings_layout.xml
+++ b/src/main/res/layout/synced_folders_settings_layout.xml
@@ -224,7 +224,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="marquee"
-                        android:maxLines="1"
+                        android:singleLine="true"
                         android:text="@string/auto_upload_on_wifi"
                         android:textAppearance="?attr/textAppearanceListItem"/>
 
@@ -271,7 +271,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="marquee"
-                        android:maxLines="1"
+                        android:singleLine="true"
                         android:text="@string/instant_upload_on_charging"
                         android:textAppearance="?attr/textAppearanceListItem"/>
 
@@ -318,7 +318,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="marquee"
-                        android:maxLines="1"
+                        android:singleLine="true"
                         android:text="@string/prefs_instant_upload_path_use_subfolders_title"
                         android:textAppearance="?attr/textAppearanceListItem"/>
 
@@ -373,7 +373,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="marquee"
-                    android:maxLines="1"
+                    android:singleLine="true"
                     android:text="@string/prefs_instant_behaviour_title"
                     android:textAppearance="?attr/textAppearanceListItem"/>
 
diff --git a/src/main/res/layout/upload_list_item.xml b/src/main/res/layout/upload_list_item.xml
index cf0ef44d6b..9187199d24 100755
--- a/src/main/res/layout/upload_list_item.xml
+++ b/src/main/res/layout/upload_list_item.xml
@@ -37,7 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:ellipsize="middle"
-            android:maxLines="1"
+            android:singleLine="true"
             android:textColor="@color/textColor"
             android:text="@string/placeholder_filename"
             android:textSize="@dimen/two_line_primary_text_size" />
@@ -53,7 +53,7 @@
                 android:gravity="left"
                 android:textColor="@color/list_item_lastmod_and_filesize_text"
                 android:ellipsize="middle"
-                android:maxLines="1"
+                android:singleLine="true"
                 android:text="@string/placeholder_filesize"
                 android:textSize="@dimen/upload_list_item_text_size"/>
             <TextView
@@ -97,7 +97,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/list_item_lastmod_and_filesize_text"
             android:ellipsize="middle"
-            android:maxLines="1"
+            android:singleLine="true"
             android:text="@string/instant_upload_path"
             android:textSize="@dimen/upload_list_item_text_size_independent"/>
 
diff --git a/src/main/res/layout/uploader_list_item_layout.xml b/src/main/res/layout/uploader_list_item_layout.xml
index 43c6821183..bd2e35ba33 100644
--- a/src/main/res/layout/uploader_list_item_layout.xml
+++ b/src/main/res/layout/uploader_list_item_layout.xml
@@ -46,7 +46,7 @@
             android:layout_marginLeft="@dimen/zero"
             android:layout_marginRight="@dimen/standard_quarter_margin"
             android:ellipsize="middle"
-            android:maxLines="1"
+            android:singleLine="true"
             android:text="TextView"
             android:textColor="@color/textColor"
             android:textSize="@dimen/two_line_primary_text_size" />