浏览代码

replace deprecated android:singleLine with android:maxLines=1

AndyScherzinger 7 年之前
父节点
当前提交
6c3af67bad

+ 2 - 2
src/main/res/layout-land/account_setup.xml

@@ -176,7 +176,7 @@
                         android:ems="10"
                         android:enabled="false"
                         android:inputType="textUri"
-                        android:singleLine="true"
+						android:maxLines="1"
                         android:text="@string/oauth2_url_endpoint_auth"
                         android:textColor="@color/login_text_color"
                         android:textColorHint="@color/login_text_hint_color"
@@ -196,7 +196,7 @@
 					android:ems="10"
 					android:enabled="false"
 					android:text="@string/oauth2_url_endpoint_access"
-					android:singleLine="true"
+					android:maxLines="1"
 					android:inputType="textUri"
 					android:textColor="@color/login_text_color"
 					android:textColorHint="@color/login_text_hint_color"

+ 2 - 2
src/main/res/layout/account_setup.xml

@@ -168,7 +168,7 @@
                 android:ems="10"
                 android:enabled="false"
                 android:inputType="textUri"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:text="@string/oauth2_url_endpoint_auth"
                 android:textColor="@color/login_text_color"
                 android:textColorHint="@color/login_text_hint_color"
@@ -188,7 +188,7 @@
                 android:ems="10"
                 android:enabled="false"
                 android:inputType="textUri"
-                android:singleLine="true"
+                android:maxLines="1"
                 android:text="@string/oauth2_url_endpoint_access"
                 android:textColor="@color/login_text_color"
                 android:textColorHint="@color/login_text_hint_color"

+ 0 - 1
src/main/res/layout/activity_manage_space.xml

@@ -26,7 +26,6 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:layout_gravity="center_vertical"
-        android:singleLine="false"
         android:layout_margin="@dimen/standard_margin"
         style="?android:attr/editTextPreferenceStyle"
         android:text="@string/manage_space_description"

+ 1 - 1
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:singleLine="true"
+			android:maxLines="1"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal" />
 

+ 1 - 1
src/main/res/layout/drawer_header.xml

@@ -88,7 +88,7 @@
                     android:shadowDx="0.5"
                     android:shadowDy="0"
                     android:shadowRadius="2"
-                    android:singleLine="true"
+                    android:maxLines="1"
                     android:text="@string/app_name"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/drawer_header_text"

+ 1 - 1
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:singleLine="true"
+            android:maxLines="1"
             android:ellipsize="middle"
             />
 

+ 1 - 1
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:singleLine="true"
+            android:maxLines="1"
             android:ellipsize="middle"
             android:textColor="@color/black"/>
 </LinearLayout>

+ 2 - 2
src/main/res/layout/grid_item.xml

@@ -94,8 +94,8 @@
         android:layout_marginRight="@dimen/standard_quarter_margin"
         android:ellipsize="middle"
         android:gravity="center_horizontal"
-        android:singleLine="true"
-        android:text="TextView"
+        android:maxLines="1"
+        android:text="@string/placeholder_filename"
         android:textColor="@color/textColor"
         android:textSize="@dimen/grid_item_text_size" />
 

+ 2 - 2
src/main/res/layout/list_item.xml

@@ -94,8 +94,8 @@
                 android:layout_marginLeft="@dimen/zero"
                 android:layout_marginRight="@dimen/standard_quarter_margin"
                 android:ellipsize="middle"
-                android:singleLine="true"
-                android:text="TextView"
+                android:maxLines="1"
+                android:text="@string/placeholder_filename"
                 android:textColor="@color/textColor"
                 android:textSize="@dimen/two_line_primary_text_size" />
 

+ 2 - 2
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:singleLine="true"
+				  android:maxLines="1"
 			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:singleLine="true"
+				  android:maxLines="1"
             android:fadingEdge="horizontal"
             android:ellipsize="marquee"
             style="@style/Theme.ownCloud.NotificationText.Content"

+ 1 - 1
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:singleLine="true"
+                android:maxLines="1"
                 android:text="@string/placeholder_filename"
                 android:textColor="@color/black"
                 android:textSize="@dimen/two_line_primary_text_size"/>

+ 1 - 1
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:singleLine="true"
+            android:maxLines="1"
             android:ellipsize="middle"
             android:layout_gravity="center_vertical"/>
 

+ 4 - 4
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:singleLine="true"
+            android:maxLines="1"
             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:singleLine="true"
+                android:maxLines="1"
                 android:text="@string/placeholder_filesize"
                 android:textSize="@dimen/upload_list_item_text_size"/>
             <TextView
@@ -87,7 +87,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/list_item_lastmod_and_filesize_text"
-            android:singleLine="true"
+            android:maxLines="1"
             android:text="@string/auth_username"
             android:textSize="@dimen/upload_list_item_text_size_independent"/>
 
@@ -97,7 +97,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/list_item_lastmod_and_filesize_text"
             android:ellipsize="middle"
-            android:singleLine="true"
+            android:maxLines="1"
             android:text="@string/instant_upload_path"
             android:textSize="@dimen/upload_list_item_text_size_independent"/>
 

+ 1 - 1
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:singleLine="true"
+            android:maxLines="1"
             android:text="TextView"
             android:textColor="@color/textColor"
             android:textSize="@dimen/two_line_primary_text_size" />

+ 1 - 1
src/main/res/values/styles.xml

@@ -225,7 +225,7 @@
 		<item name="android:digits">1234567890</item>
 		<item name="android:maxLength">1</item>
 		<item name="android:password">true</item>
-		<item name="android:singleLine">true</item>
+		<item name="android:maxLines">1</item>
   		    
     </style>