Skip to content

Commit 0cdbc00

Browse files
Merge pull request #14404 from nextcloud/fixAutoUploadLines
remove 2 line max restriction
2 parents fa24ba6 + dc4cfac commit 0cdbc00

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

app/src/main/res/layout/synced_folders_settings_layout.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@
143143
android:layout_width="wrap_content"
144144
android:layout_height="wrap_content"
145145
android:ellipsize="marquee"
146-
android:maxLines="2"
147146
android:text="@string/auto_upload_on_wifi"
148147
android:textAppearance="?attr/textAppearanceListItem" />
149148
</RelativeLayout>
@@ -182,7 +181,6 @@
182181
android:layout_width="wrap_content"
183182
android:layout_height="wrap_content"
184183
android:ellipsize="marquee"
185-
android:maxLines="2"
186184
android:text="@string/instant_upload_on_charging"
187185
android:textAppearance="?attr/textAppearanceListItem" />
188186
</RelativeLayout>
@@ -259,7 +257,6 @@
259257
android:layout_width="wrap_content"
260258
android:layout_height="wrap_content"
261259
android:ellipsize="marquee"
262-
android:maxLines="2"
263260
android:text="@string/prefs_instant_upload_path_use_subfolders_title"
264261
android:textAppearance="?attr/textAppearanceListItem" />
265262

@@ -270,7 +267,6 @@
270267
android:layout_below="@id/setting_instant_upload_path_use_subfolders_label"
271268
android:layout_alignStart="@id/setting_instant_upload_path_use_subfolders_label"
272269
android:ellipsize="end"
273-
android:maxLines="2"
274270
android:text="@string/prefs_instant_upload_path_use_date_subfolders_summary"
275271
android:textColor="?android:attr/textColorSecondary" />
276272
</RelativeLayout>
@@ -310,7 +306,6 @@
310306
android:layout_width="wrap_content"
311307
android:layout_height="wrap_content"
312308
android:ellipsize="marquee"
313-
android:maxLines="2"
314309
android:text="@string/prefs_instant_upload_exclude_hidden_title"
315310
android:textAppearance="?attr/textAppearanceListItem" />
316311

@@ -321,7 +316,6 @@
321316
android:layout_below="@id/setting_instant_upload_exclude_hidden_label"
322317
android:layout_alignStart="@id/setting_instant_upload_exclude_hidden_label"
323318
android:ellipsize="end"
324-
android:maxLines="2"
325319
android:text="@string/prefs_instant_upload_exclude_hidden_summary"
326320
android:textColor="?android:attr/textColorSecondary" />
327321
</RelativeLayout>
@@ -360,7 +354,6 @@
360354
android:layout_width="wrap_content"
361355
android:layout_height="wrap_content"
362356
android:ellipsize="marquee"
363-
android:maxLines="2"
364357
android:text="@string/prefs_instant_upload_subfolder_rule_title"
365358
android:textAppearance="?attr/textAppearanceListItem" />
366359

@@ -388,7 +381,6 @@
388381
android:layout_width="wrap_content"
389382
android:layout_height="wrap_content"
390383
android:ellipsize="marquee"
391-
android:maxLines="2"
392384
android:text="@string/prefs_instant_behaviour_title"
393385
android:textAppearance="?attr/textAppearanceListItem" />
394386

@@ -397,7 +389,6 @@
397389
android:layout_width="wrap_content"
398390
android:layout_height="wrap_content"
399391
android:ellipsize="end"
400-
android:maxLines="2"
401392
android:text="@string/placeholder_filename"
402393
android:textColor="?android:attr/textColorSecondary" />
403394
</LinearLayout>
@@ -418,7 +409,6 @@
418409
android:layout_width="wrap_content"
419410
android:layout_height="wrap_content"
420411
android:ellipsize="marquee"
421-
android:maxLines="2"
422412
android:text="@string/pref_instant_name_collision_policy_title"
423413
android:textAppearance="?attr/textAppearanceListItem" />
424414

@@ -427,7 +417,6 @@
427417
android:layout_width="wrap_content"
428418
android:layout_height="wrap_content"
429419
android:ellipsize="end"
430-
android:maxLines="2"
431420
android:text="@string/placeholder_filename"
432421
android:textColor="?android:attr/textColorSecondary" />
433422
</LinearLayout>

0 commit comments

Comments
 (0)