Merge pull request #5594 from nextcloud/feature/minSdk17

change minimum supported Android version to 4.2

build.gradle

@@ -129,7 +129,7 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 17
         targetSdkVersion 29
 
         // arguments to be passed to functional tests

src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java

@@ -180,15 +180,8 @@ public class SyncedFolderPreferencesDialogFragment extends DialogFragment {
         mUploadOnWifiCheckbox = view.findViewById(R.id.setting_instant_upload_on_wifi_checkbox);
         ThemeUtils.tintCheckbox(mUploadOnWifiCheckbox, accentColor);
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            view.findViewById(R.id.setting_instant_upload_on_charging_container).setVisibility(View.GONE);
-        } else {
-            view.findViewById(R.id.setting_instant_upload_on_charging_container).setVisibility(View.VISIBLE);
-
-            mUploadOnChargingCheckbox = view.findViewById(
-                    R.id.setting_instant_upload_on_charging_checkbox);
-            ThemeUtils.tintCheckbox(mUploadOnChargingCheckbox, accentColor);
-        }
+        mUploadOnChargingCheckbox = view.findViewById(R.id.setting_instant_upload_on_charging_checkbox);
+        ThemeUtils.tintCheckbox(mUploadOnChargingCheckbox, accentColor);
 
         mUploadExistingCheckbox = view.findViewById(R.id.setting_instant_upload_existing_checkbox);
         ThemeUtils.tintCheckbox(mUploadExistingCheckbox, accentColor);

src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java

@@ -232,8 +232,7 @@ public abstract class PreviewTextFragment extends FileFragment implements Search
                                Activity activity,
                                boolean ignoreMimetype,
                                boolean preview) {
-        if ((ignoreMimetype || file != null && MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN.equals(file.getMimeType())) &&
-            android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN
+        if ((ignoreMimetype || file != null && MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN.equals(file.getMimeType()))
             && activity != null) {
             if (!preview) {
                 // clickable links prevent to open full view of rich workspace

src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -491,20 +491,17 @@ public final class FileStorageUtils {
             // Device has emulated storage; external storage paths should have
             // userId burned into them.
             final String rawUserId;
-            if (SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                rawUserId = "";
-            } else {
-                final String path = Environment.getExternalStorageDirectory().getAbsolutePath();
-                final String[] folders = OCFile.PATH_SEPARATOR.split(path);
-                final String lastFolder = folders[folders.length - 1];
-                boolean isDigit = false;
-                try {
-                    Integer.valueOf(lastFolder);
-                    isDigit = true;
-                } catch (NumberFormatException ignored) {
-                }
-                rawUserId = isDigit ? lastFolder : "";
+            final String path = Environment.getExternalStorageDirectory().getAbsolutePath();
+            final String[] folders = OCFile.PATH_SEPARATOR.split(path);
+            final String lastFolder = folders[folders.length - 1];
+            boolean isDigit = false;
+            try {
+                Integer.valueOf(lastFolder);
+                isDigit = true;
+            } catch (NumberFormatException ignored) {
             }
+            rawUserId = isDigit ? lastFolder : "";
+
             // /storage/emulated/0[1,2,...]
             if (TextUtils.isEmpty(rawUserId)) {
                 rv.add(rawEmulatedStorageTarget);

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

@@ -105,9 +105,7 @@
                         android:drawablePadding="@dimen/alternate_half_padding"
                         android:inputType="textUri"
                         android:paddingStart="@dimen/zero"
-                        android:paddingLeft="@dimen/zero"
                         android:paddingEnd="@dimen/alternate_padding_right"
-                        android:paddingRight="@dimen/alternate_padding_right"
                         android:textColor="@color/login_text_color"
                         android:textColorHint="@color/login_text_hint_color">
 
@@ -123,7 +121,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical|end"
                     android:layout_marginEnd="@dimen/alternate_half_padding"
-                    android:layout_marginRight="@dimen/alternate_half_padding"
                     android:background="@android:color/transparent"
                     android:contentDescription="@string/test_server_button"
                     android:onClick="onTestServerConnectionClick"
@@ -138,7 +135,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical|end"
                     android:layout_marginEnd="@dimen/alternate_half_margin"
-                    android:layout_marginRight="@dimen/alternate_half_margin"
                     android:background="@android:color/transparent"
                     android:contentDescription="@string/auth_refresh_button"
                     android:padding="@dimen/zero"
@@ -154,7 +150,6 @@
                 android:layout_marginBottom="@dimen/alternate_half_margin"
                 android:contentDescription="@string/auth_testing_connection"
                 android:drawableStart="@android:drawable/stat_notify_sync"
-                android:drawableLeft="@android:drawable/stat_notify_sync"
                 android:drawablePadding="@dimen/alternate_half_padding"
                 android:gravity="center_vertical"
                 android:minHeight="@dimen/display_text_min_height"
@@ -192,7 +187,6 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/auth_unauthorized"
                 android:drawableStart="@android:drawable/stat_notify_sync"
-                android:drawableLeft="@android:drawable/stat_notify_sync"
                 android:drawablePadding="@dimen/alternate_half_padding"
                 android:gravity="center_vertical"
                 android:text="@string/auth_unauthorized"

src/main/res/layout/account_action.xml

@@ -32,8 +32,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="@dimen/list_item_avatar_icon_margin"
-        android:layout_marginStart="@dimen/list_item_avatar_text_margin"
+        android:layout_marginStart="@dimen/list_item_avatar_icon_margin"
         android:src="@drawable/ic_account_plus"
         android:contentDescription="@string/prefs_add_account"/>
 
@@ -44,11 +43,9 @@
         android:layout_weight="1"
         android:gravity="center_vertical"
         android:paddingEnd="@dimen/standard_padding"
-        android:paddingLeft="28dp"
-        android:paddingRight="@dimen/standard_padding"
         android:paddingStart="28dp"
         android:text="@string/prefs_add_account"
         android:textColor="@color/primary"
         android:textSize="@dimen/two_line_primary_text_size" />
 
-</LinearLayout>         
+</LinearLayout>

src/main/res/layout/account_item.xml

@@ -31,7 +31,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true">
 
         <ImageView
@@ -40,9 +39,7 @@
             android:layout_height="@dimen/user_icon_size"
             android:layout_gravity="top|start"
             android:layout_marginBottom="@dimen/account_item_layout_user_image_margin"
-            android:layout_marginLeft="@dimen/account_item_layout_user_image_left_start_margin"
             android:layout_marginStart="@dimen/account_item_layout_user_image_left_start_margin"
-            android:layout_marginRight="@dimen/account_item_layout_user_image_margin"
             android:layout_marginEnd="@dimen/account_item_layout_user_image_margin"
             android:layout_marginTop="@dimen/account_item_layout_user_image_margin"
             android:src="@drawable/folder"
@@ -63,11 +60,8 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_toEndOf="@id/avatar_container"
-        android:layout_toRightOf="@id/avatar_container"
         android:orientation="vertical"
         android:paddingEnd="@dimen/zero"
-        android:paddingLeft="3dp"
-        android:paddingRight="@dimen/zero"
         android:paddingStart="3dp">
 
         <TextView
@@ -75,8 +69,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/standard_half_margin"
-            android:layout_marginLeft="@dimen/standard_margin"
-            android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_marginStart="@dimen/standard_margin"
             android:layout_marginTop="@dimen/standard_quarter_margin"
             android:ellipsize="end"
@@ -91,8 +83,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_half_margin"
-            android:layout_marginLeft="@dimen/standard_margin"
-            android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_marginStart="@dimen/standard_margin"
             android:ellipsize="end"
             android:gravity="top"
@@ -101,4 +91,4 @@
             android:textColor="?android:attr/textColorSecondary"/>
     </LinearLayout>
 
-</RelativeLayout>
+</RelativeLayout>

src/main/res/layout/account_setup.xml

@@ -105,9 +105,7 @@
                         android:drawablePadding="@dimen/alternate_half_padding"
                         android:inputType="textUri"
                         android:paddingStart="@dimen/zero"
-                        android:paddingLeft="@dimen/zero"
                         android:paddingEnd="@dimen/alternate_padding_right"
-                        android:paddingRight="@dimen/alternate_padding_right"
                         android:textColor="@color/login_text_color"
                         android:textColorHint="@color/login_text_color">
 
@@ -123,7 +121,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical|end"
                     android:layout_marginEnd="@dimen/alternate_half_padding"
-                    android:layout_marginRight="@dimen/alternate_half_padding"
                     android:background="@android:color/transparent"
                     android:contentDescription="@string/test_server_button"
                     android:onClick="onTestServerConnectionClick"
@@ -138,7 +135,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical|end"
                     android:layout_marginEnd="@dimen/alternate_half_padding"
-                    android:layout_marginRight="@dimen/alternate_half_padding"
                     android:background="@android:color/transparent"
                     android:contentDescription="@string/auth_refresh_button"
                     android:padding="@dimen/zero"
@@ -154,7 +150,6 @@
                 android:layout_marginBottom="@dimen/alternate_margin"
                 android:contentDescription="@string/auth_testing_connection"
                 android:drawableStart="@android:drawable/stat_notify_sync"
-                android:drawableLeft="@android:drawable/stat_notify_sync"
                 android:drawablePadding="@dimen/alternate_half_padding"
                 android:gravity="center_vertical"
                 android:minHeight="@dimen/display_text_min_height"
@@ -193,7 +188,6 @@
                 android:layout_marginBottom="@dimen/alternate_margin"
                 android:contentDescription="@string/auth_unauthorized"
                 android:drawableStart="@android:drawable/stat_notify_sync"
-                android:drawableLeft="@android:drawable/stat_notify_sync"
                 android:drawablePadding="@dimen/alternate_half_padding"
                 android:gravity="center_vertical"
                 android:text="@string/auth_unauthorized"

src/main/res/layout/activity_list_item.xml

@@ -44,7 +44,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_toRightOf="@id/activity_icon"
         android:layout_toEndOf="@id/activity_icon">
 
         <TextView
@@ -53,8 +52,6 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:paddingEnd="@dimen/zero"
-            android:paddingLeft="@dimen/activity_icon_layout_right_end_margin"
-            android:paddingRight="@dimen/zero"
             android:paddingStart="@dimen/activity_icon_layout_right_end_margin"
             android:paddingTop="@dimen/standard_padding"
             tools:text="@string/placeholder_filename"
@@ -65,8 +62,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingEnd="@dimen/zero"
-            android:paddingLeft="@dimen/activity_icon_layout_right_end_margin"
-            android:paddingRight="@dimen/zero"
             android:paddingStart="@dimen/activity_icon_layout_right_end_margin"
             android:ellipsize="end"
             tools:text="@string/placeholder_sentence"
@@ -77,11 +72,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/alternate_half_margin"
-            android:layout_marginLeft="@dimen/activity_list_item_grid_layout_left_start_margin"
             android:layout_marginStart="@dimen/activity_list_item_grid_layout_left_start_margin"
             android:paddingEnd="@dimen/zero"
-            android:paddingLeft="@dimen/activity_icon_layout_right_end_margin"
-            android:paddingRight="@dimen/zero"
             android:paddingStart="@dimen/activity_icon_layout_right_end_margin"
             android:columnCount="3" />
 
@@ -92,8 +84,6 @@
             android:layout_gravity="end"
             android:ellipsize="end"
             android:paddingEnd="@dimen/zero"
-            android:paddingLeft="@dimen/activity_icon_layout_right_end_margin"
-            android:paddingRight="@dimen/zero"
             android:paddingStart="@dimen/activity_icon_layout_right_end_margin"
             tools:text="@string/placeholder_sentence"
             android:textColor="?android:attr/textColorSecondary"/>

src/main/res/layout/activity_list_item_header.xml

@@ -28,7 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_marginStart="@dimen/standard_list_item_size"
-        android:layout_marginLeft="@dimen/standard_list_item_size"
         android:layout_marginTop="10dp"
         android:text="@string/placeholder_filename"
         android:textSize="@dimen/activity_list_item_title_header_text_size" />

src/main/res/layout/activity_row.xml

@@ -34,8 +34,7 @@
 		android:layout_height="@dimen/user_icon_size_independent"
 		android:layout_gravity="center_vertical"
 		android:layout_marginEnd="@dimen/standard_padding"
-		android:layout_marginRight="@dimen/standard_padding"
-		android:contentDescription="@string/activity_icon" />
+        android:contentDescription="@string/activity_icon" />
 
 	<TextView
 		android:id="@+id/title"
@@ -46,4 +45,4 @@
 		android:singleLine="true"
 		android:textAppearance="?android:attr/textAppearanceLargePopupMenu" />
 
-    </LinearLayout>
+    </LinearLayout>

src/main/res/layout/activity_sso_grant_permission.xml

@@ -32,7 +32,6 @@
         android:layout_height="@dimen/user_icon_size"
         android:layout_gravity="top|start"
         android:layout_marginEnd="@dimen/standard_margin"
-        android:layout_marginRight="@dimen/standard_margin"
         android:contentDescription="@null"
         android:src="@drawable/background"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -72,7 +71,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/standard_half_margin"
-                android:layout_marginRight="@dimen/standard_half_margin"
                 android:text="@string/permission_deny"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/btnGrant"/>

src/main/res/layout/contactlist_list_item.xml

@@ -35,7 +35,6 @@
         android:id="@+id/contactlist_item_name"
         android:layout_width="0dp"
         android:layout_height="@dimen/standard_list_item_size"
-        android:layout_marginRight="@dimen/standard_margin"
         android:layout_marginEnd="@dimen/standard_margin"
         android:layout_weight="1"
         android:checkMark="?android:attr/listChoiceIndicatorMultiple"

src/main/res/layout/drawer_header.xml

@@ -62,7 +62,6 @@
                 android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size"
                 android:layout_gravity="end"
                 android:layout_marginEnd="@dimen/nav_drawer_header_avatar_second_account_margin"
-                android:layout_marginRight="@dimen/nav_drawer_header_avatar_second_account_margin"
                 android:src="@drawable/account_circle_white"
                 android:onClick="onAccountDrawerClick"
                 android:contentDescription="@string/drawer_middle_account"/>
@@ -91,9 +90,7 @@
                 android:layout_weight="1"
                 android:orientation="vertical"
                 android:paddingEnd="@dimen/standard_half_padding"
-                android:paddingRight="@dimen/standard_half_padding"
-                android:paddingStart="@dimen/zero"
-                android:paddingLeft="@dimen/zero">
+                android:paddingStart="@dimen/zero">
 
                 <TextView
                     android:id="@+id/drawer_username"

src/main/res/layout/file_details_activities_fragment.xml

@@ -27,8 +27,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/zero"
-        android:layout_marginLeft="@dimen/standard_padding"
-        android:layout_marginRight="@dimen/zero"
         android:layout_marginStart="@dimen/standard_padding"
         android:orientation="horizontal">
 

src/main/res/layout/file_details_fragment.xml

@@ -75,9 +75,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/zero"
-                            android:layout_marginLeft="@dimen/zero"
                             android:layout_marginEnd="@dimen/standard_eighth_margin"
-                            android:layout_marginRight="@dimen/standard_eighth_margin"
                             android:contentDescription="@null"
                             android:src="@drawable/ic_star_outline" />
 
@@ -94,9 +92,7 @@
                             android:layout_height="wrap_content"
                             android:gravity="end"
                             android:paddingStart="@dimen/zero"
-                            android:paddingLeft="@dimen/zero"
                             android:paddingEnd="@dimen/standard_quarter_padding"
-                            android:paddingRight="@dimen/standard_quarter_padding"
                             android:text="@string/info_separator"
                             android:textColor="@color/list_item_lastmod_and_filesize_text"
                             android:textSize="@dimen/two_line_secondary_text_size" />
@@ -113,9 +109,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/standard_margin"
-                            android:layout_marginLeft="@dimen/standard_margin"
                             android:layout_marginEnd="@dimen/standard_eighth_margin"
-                            android:layout_marginRight="@dimen/standard_eighth_margin"
                             android:contentDescription="@null"
                             android:src="@drawable/ic_tag"
                             android:visibility="gone" />
@@ -175,7 +169,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="@dimen/standard_half_margin"
-                        android:layout_marginLeft="@dimen/standard_half_margin"
                         android:background="@android:color/transparent"
                         android:contentDescription="@string/common_cancel"
                         android:src="@drawable/ic_cancel" />

src/main/res/layout/file_details_share_user_item.xml

@@ -44,7 +44,6 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_weight="1"
             android:ellipsize="end"
             android:gravity="center_vertical"

src/main/res/layout/file_details_sharing_fragment.xml

@@ -35,9 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/standard_eighth_margin"
-            android:layout_marginLeft="@dimen/standard_eighth_margin"
             android:layout_marginEnd="@dimen/standard_margin"
-            android:layout_marginRight="@dimen/standard_margin"
             android:hint="@string/share_search"
             style="@style/ownCloud.SearchView"/>
 
@@ -119,10 +117,8 @@
                     android:layout_weight="1"
                     android:contentDescription="@string/copy_link"
                     android:paddingStart="@dimen/standard_half_margin"
-                    android:paddingLeft="@dimen/standard_half_margin"
                     android:paddingTop="@dimen/standard_quarter_margin"
                     android:paddingEnd="@dimen/standard_eighth_margin"
-                    android:paddingRight="@dimen/standard_eighth_margin"
                     android:paddingBottom="@dimen/standard_quarter_margin"
                     android:scaleType="fitStart"
                     android:src="@drawable/ic_content_copy" />
@@ -143,13 +139,10 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|center"
                 android:layout_marginStart="@dimen/standard_half_margin"
-                android:layout_marginLeft="@dimen/standard_half_margin"
                 android:layout_weight="0"
                 android:contentDescription="@string/overflow_menu"
                 android:paddingStart="@dimen/standard_half_padding"
-                android:paddingLeft="@dimen/standard_half_padding"
                 android:paddingEnd="@dimen/zero"
-                android:paddingRight="@dimen/zero"
                 android:src="@drawable/ic_dots_vertical"/>
         </LinearLayout>
 

src/main/res/layout/file_download_fragment.xml

@@ -19,19 +19,19 @@
     android:id="@+id/fileDownloadLL"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:orientation="vertical" 
+    android:orientation="vertical"
 	android:layout_gravity="center"
 	android:gravity="center_vertical"
 	android:padding="@dimen/file_download_fragment_layout_padding">
-	
-	<TextView 
-	    android:id="@+id/progressText" 
+
+    <TextView
+        android:id="@+id/progressText"
 	    android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:textColor="@color/dark_background_text_color"
 		android:text="@string/downloader_not_downloaded_yet"
 		android:layout_marginBottom="@dimen/alternate_fragment_margin" />
-	
+
     <LinearLayout
         android:id="@+id/fdProgressBlock"
 		android:layout_width="match_parent"
@@ -40,7 +40,7 @@
 		android:layout_marginTop="@dimen/fragment_margin"
 		android:layout_marginBottom="@dimen/alternate_fragment_margin"
 		android:orientation="horizontal">
-	    				
+
 		<ProgressBar android:id="@+id/progressBar"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
@@ -53,15 +53,14 @@
 			android:id="@+id/cancelBtn"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="@dimen/fragment_margin"
-			android:layout_marginStart="@dimen/fragment_margin"
+            android:layout_marginStart="@dimen/fragment_margin"
 			android:src="@drawable/ic_action_cancel_grey"
 			android:background="@android:color/transparent"
 			android:contentDescription="@string/common_cancel"/>
 
 	</LinearLayout>
-			
-	<ImageView
+
+    <ImageView
 		android:id="@+id/error_image"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -69,15 +68,15 @@
 		android:layout_gravity="center_horizontal"
 		android:contentDescription="@string/downloader_download_failed_ticker"
 		android:src="@drawable/image_fail" />
-										
-	<TextView 
-	    android:id="@+id/errorText" 
+
+    <TextView
+        android:id="@+id/errorText"
 	    android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_horizontal"
 		android:layout_margin="@dimen/file_download_fragment_display_text_margin"
 		android:textColor="@color/dark_background_text_color"
 		android:text="@string/downloader_download_failed_ticker" />
-	
+
 </LinearLayout>
 

src/main/res/layout/file_list_actions_bottom_sheet_creator.xml

@@ -44,7 +44,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/standard_margin"
-        android:layout_marginLeft="@dimen/standard_margin"
         android:text="@string/create_new_presentation"
         android:textColor="@color/text_color"
         android:textSize="@dimen/bottom_sheet_text_size" />

src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml

@@ -57,7 +57,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/standard_margin"
-            android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/upload_files"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -88,7 +87,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/standard_margin"
-            android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/upload_content_from_other_apps"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -119,7 +117,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/standard_margin"
-            android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/upload_direct_camera_upload"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -160,7 +157,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/standard_margin"
-            android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/create_new_folder"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size" />
@@ -206,7 +202,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/standard_margin"
-                android:layout_marginLeft="@dimen/standard_margin"
                 android:text="@string/create_new_document"
                 android:textColor="@color/text_color"
                 android:textSize="@dimen/bottom_sheet_text_size" />
@@ -235,7 +230,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/standard_margin"
-                android:layout_marginLeft="@dimen/standard_margin"
                 android:text="@string/create_new_spreadsheet"
                 android:textColor="@color/text_color"
                 android:textSize="@dimen/bottom_sheet_text_size" />
@@ -264,7 +258,6 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginStart="@dimen/standard_margin"
-                android:layout_marginLeft="@dimen/standard_margin"
                 android:text="@string/create_new_presentation"
                 android:textColor="@color/text_color"
                 android:textSize="@dimen/bottom_sheet_text_size" />
@@ -329,7 +322,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/standard_margin"
-            android:layout_marginLeft="@dimen/standard_margin"
             android:text="@string/create_rich_workspace"
             android:textColor="@color/text_color"
             android:textSize="@dimen/bottom_sheet_text_size"

src/main/res/layout/files_folder_picker.xml

@@ -58,7 +58,6 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel"
-            android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_marginEnd="@dimen/standard_half_margin"
             app:cornerRadius="@dimen/button_corner_radius" />
 

src/main/res/layout/files_picker.xml

@@ -60,7 +60,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/standard_half_margin"
-            android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_weight="1"
             android:stateListAnimator="@null"
             app:cornerRadius="@dimen/button_corner_radius"

src/main/res/layout/grid_image.xml

@@ -54,7 +54,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top|end"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginTop="@dimen/grid_image_shared_icon_layout_top_margin"
             android:contentDescription="@string/shared_icon_shared_via_link"
             android:src="@drawable/shared_via_link" />
@@ -65,7 +64,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top|end"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginTop="@dimen/grid_image_shared_icon_layout_top_margin"
             android:clickable="true"
             android:contentDescription="@string/unread_comments"
@@ -80,7 +78,6 @@
             android:layout_gravity="bottom|end"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginTop="@dimen/standard_quarter_margin"
             android:contentDescription="@string/synced_icon"
             android:src="@drawable/ic_synced" />

src/main/res/layout/grid_item.xml

@@ -52,7 +52,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top|end"
             android:layout_marginTop="@dimen/grid_item_shared_icon_layout_top_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:src="@drawable/shared_via_link"
             android:contentDescription="@string/shared_icon_shared_via_link"/>
@@ -66,7 +65,6 @@
             android:focusable="true"
             android:layout_gravity="top|end"
             android:layout_marginTop="@dimen/grid_item_shared_icon_layout_top_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:src="@drawable/ic_comment_grid"
             android:visibility="gone" />
@@ -77,7 +75,6 @@
             android:layout_height="@dimen/grid_item_local_file_indicator_layout_height"
             android:layout_gravity="bottom|end"
             android:layout_marginBottom="@dimen/standard_quarter_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:layout_marginTop="@dimen/standard_quarter_margin"
             android:src="@drawable/ic_synced"

src/main/res/layout/info_box.xml

@@ -32,7 +32,6 @@
         android:id="@+id/info_box_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ic_information_outline"
         android:drawablePadding="@dimen/standard_half_padding"
         android:drawableStart="@drawable/ic_information_outline"
         android:gravity="center"

src/main/res/layout/list_fragment.xml

@@ -48,10 +48,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_marginBottom="@dimen/standard_margin"
         android:layout_marginEnd="@dimen/standard_margin"
-        android:layout_marginRight="@dimen/standard_margin"
         android:contentDescription="@string/fab_label"
         android:visibility="gone" />
 

src/main/res/layout/list_item.xml

@@ -31,8 +31,6 @@
         android:layout_height="@dimen/standard_list_item_size"
         android:paddingBottom="@dimen/standard_padding"
         android:paddingEnd="@dimen/standard_quarter_padding"
-        android:paddingLeft="@dimen/zero"
-        android:paddingRight="@dimen/standard_quarter_padding"
         android:paddingStart="@dimen/zero"
         android:paddingTop="@dimen/standard_padding">
 
@@ -41,7 +39,6 @@
             android:layout_width="@dimen/file_icon_size"
             android:layout_height="@dimen/file_icon_size"
             android:layout_centerInParent="true"
-            android:layout_marginLeft="@dimen/standard_half_margin"
             android:layout_marginStart="@dimen/standard_half_margin"
             android:contentDescription="@null"
             android:src="@drawable/folder"/>
@@ -51,10 +48,8 @@
             android:layout_width="@dimen/list_item_favorite_action_layout_width"
             android:layout_height="@dimen/list_item_favorite_action_layout_height"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:contentDescription="@string/favorite"
             android:src="@drawable/favorite"/>
 
@@ -64,9 +59,7 @@
             android:layout_height="@dimen/list_item_local_file_indicator_layout_height"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:contentDescription="@string/downloader_download_succeeded_ticker"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_synced" />
@@ -111,8 +104,6 @@
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:paddingEnd="@dimen/standard_quarter_padding"
-                android:paddingLeft="@dimen/zero"
-                android:paddingRight="@dimen/standard_quarter_padding"
                 android:paddingStart="@dimen/zero"
                 android:text="@string/info_separator"
                 android:textColor="@color/list_item_lastmod_and_filesize_text"
@@ -136,8 +127,6 @@
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
         android:paddingEnd="@dimen/zero"
-        android:paddingLeft="@dimen/standard_half_padding"
-        android:paddingRight="@dimen/zero"
         android:paddingStart="@dimen/standard_half_padding">
 
         <ImageView
@@ -149,8 +138,6 @@
             android:contentDescription="@string/unread_comments"
             android:focusable="true"
             android:paddingEnd="@dimen/list_item_share_right_margin"
-            android:paddingLeft="@dimen/standard_half_padding"
-            android:paddingRight="@dimen/list_item_share_right_margin"
             android:paddingStart="@dimen/standard_half_padding"
             android:src="@drawable/ic_comment"
             android:visibility="gone"/>
@@ -161,13 +148,10 @@
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/unreadComments"
-            android:layout_toRightOf="@id/unreadComments"
             android:clickable="true"
             android:contentDescription="@string/shared_icon_share"
             android:focusable="true"
             android:paddingEnd="@dimen/list_item_share_right_margin"
-            android:paddingLeft="@dimen/standard_half_padding"
-            android:paddingRight="@dimen/list_item_share_right_margin"
             android:paddingStart="@dimen/standard_half_padding"
             android:src="@drawable/ic_unshared"/>
 
@@ -176,10 +160,8 @@
             android:layout_width="100dp"
             android:layout_height="@dimen/file_icon_size"
             android:layout_centerVertical="true"
-            android:layout_alignRight="@id/sharedIcon"
             android:layout_alignEnd="@id/sharedIcon"
             android:layout_toEndOf="@id/sharedIcon"
-            android:layout_toRightOf="@id/sharedIcon"
             android:contentDescription="@string/shared_avatar_desc"
             android:visibility="visible"/>
 
@@ -189,13 +171,10 @@
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/sharedAvatars"
-            android:layout_toRightOf="@id/sharedAvatars"
             android:clickable="false"
             android:contentDescription="@string/checkbox"
             android:focusable="false"
             android:paddingEnd="@dimen/alternate_padding"
-            android:paddingLeft="@dimen/standard_half_padding"
-            android:paddingRight="@dimen/alternate_padding"
             android:paddingStart="@dimen/standard_half_padding"
             android:src="@drawable/ic_checkbox_blank_outline"/>
 
@@ -205,13 +184,10 @@
             android:layout_height="match_parent"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/custom_checkbox"
-            android:layout_toRightOf="@id/custom_checkbox"
             android:clickable="true"
             android:contentDescription="@string/overflow_menu"
             android:focusable="true"
             android:paddingEnd="@dimen/alternate_padding"
-            android:paddingLeft="@dimen/standard_half_padding"
-            android:paddingRight="@dimen/alternate_padding"
             android:paddingStart="@dimen/standard_half_padding"
             android:src="@drawable/ic_dots_vertical"/>
 

src/main/res/layout/loading_dialog.xml

@@ -37,7 +37,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="@dimen/standard_margin"
         android:layout_marginStart="@dimen/standard_margin"
         android:text="@string/common_loading" />
 

src/main/res/layout/notification_list_item.xml

@@ -36,7 +36,6 @@
         android:layout_height="@dimen/notification_icon_height"
         android:layout_alignParentTop="true"
         android:layout_marginEnd="@dimen/notification_icon_layout_right_end_margin"
-        android:layout_marginRight="@dimen/notification_icon_layout_right_end_margin"
         android:padding="2dp"
         android:alpha="0.5"
         android:background="@drawable/round_bgnd_icons"
@@ -48,7 +47,6 @@
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:layout_alignTop="@id/notification_icon"
-        android:layout_toRightOf="@id/notification_icon"
         android:layout_toEndOf="@id/notification_icon">
 
         <LinearLayout
@@ -87,7 +85,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/alternate_half_margin"
-            android:layout_marginLeft="@dimen/notification_list_item_grid_layout_left_start_margin"
             android:layout_marginStart="@dimen/notification_list_item_grid_layout_left_start_margin"
             android:columnCount="3"
             android:orientation="horizontal"/>

src/main/res/layout/search_users_groups_layout.xml

@@ -22,8 +22,7 @@
               android:orientation="vertical"
               android:id="@+id/search_layout"
               android:minWidth="@dimen/search_users_groups_layout_width"
-              android:layout_marginRight="@dimen/standard_margin"
-              android:layout_marginEnd="@dimen/standard_margin"
+    android:layout_marginEnd="@dimen/standard_margin"
               android:layout_marginBottom="@dimen/standard_half_margin">
 
     <TextView
@@ -46,9 +45,7 @@
         android:layout_height="match_parent"
         android:id="@+id/searchUsersListView"
         android:scrollbars="vertical"
-        android:layout_marginLeft="@dimen/search_users_groups_layout_list_view_margin"
         android:layout_marginStart="@dimen/search_users_groups_layout_list_view_margin"
-        android:layout_marginRight="@dimen/standard_half_margin"
         android:layout_marginEnd="@dimen/standard_half_margin"/>
 
 </LinearLayout>

src/main/res/layout/send_share_fragment.xml

@@ -55,10 +55,8 @@
                 android:contentDescription="@string/share"
                 android:src="@drawable/shared_via_users"
                 android:paddingTop="@dimen/share_people_icon_layout_padding"
-                android:paddingRight="@dimen/share_people_icon_layout_padding"
                 android:paddingEnd="@dimen/share_people_icon_layout_padding"
                 android:paddingBottom="@dimen/share_people_icon_layout_padding"
-                android:paddingLeft="@dimen/standard_half_padding"
                 android:paddingStart="@dimen/standard_half_padding"
                 android:background="@drawable/round_bgnd"/>
 

src/main/res/layout/share_file_layout.xml

@@ -40,7 +40,6 @@
                 android:layout_width="@dimen/file_icon_size"
                 android:layout_height="@dimen/file_icon_size"
                 android:layout_gravity="center_vertical"
-                android:layout_marginRight="@dimen/standard_half_margin"
                 android:layout_marginEnd="@dimen/standard_half_margin"
                 android:contentDescription="@null"
                 android:src="@drawable/file"/>
@@ -50,11 +49,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/standard_half_margin"
-                android:layout_marginLeft="@dimen/standard_quarter_margin"
-                android:layout_marginRight="@dimen/standard_half_margin"
                 android:layout_marginStart="@dimen/standard_quarter_margin"
                 android:layout_toEndOf="@+id/shareFileIcon"
-                android:layout_toRightOf="@+id/shareFileIcon"
                 android:ellipsize="middle"
                 android:singleLine="true"
                 android:text="@string/placeholder_filename"
@@ -67,10 +63,8 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/shareFileName"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/standard_quarter_margin"
                 android:layout_marginStart="@dimen/standard_quarter_margin"
                 android:layout_toEndOf="@+id/shareFileIcon"
-                android:layout_toRightOf="@+id/shareFileIcon"
                 android:text="@string/placeholder_fileSize"
                 android:textSize="@dimen/share_file_layout_text_size"/>
 
@@ -108,9 +102,7 @@
                 android:layout_height="0dip"
                 android:layout_weight="1"
                 android:paddingStart="@dimen/standard_half_padding"
-                android:paddingLeft="@dimen/standard_half_padding"
                 android:paddingEnd="@dimen/standard_half_padding"
-                android:paddingRight="@dimen/zero"
                 android:scrollbars="vertical"
                 android:visibility="gone"/>
 
@@ -152,9 +144,7 @@
                 android:layout_gravity="start"
                 android:layout_marginTop="@dimen/standard_half_margin"
                 android:checked="false"
-                android:paddingRight="@dimen/standard_half_padding"
                 android:paddingEnd="@dimen/standard_half_padding"
-                android:paddingLeft="@dimen/zero"
                 android:paddingStart="@dimen/zero"
                 android:text="@string/share_via_link_section_title"
                 android:textColor="@color/color_accent"/>
@@ -178,7 +168,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
                         android:layout_centerInParent="true"
                         android:padding="@dimen/standard_half_padding"
                         />
@@ -187,9 +176,7 @@
                         android:id="@+id/shareViaLinkEditPermissionLabel"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:layout_toLeftOf="@id/shareViaLinkEditPermissionSwitch"
                         android:layout_toStartOf="@id/shareViaLinkEditPermissionSwitch"
                         android:padding="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_edit_permission_label"
@@ -212,7 +199,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
                         android:layout_centerInParent="true"
                         android:padding="@dimen/standard_half_padding"
                         />
@@ -221,9 +207,7 @@
                         android:id="@+id/shareViaLinkFileListingPermissionLabel"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:layout_toLeftOf="@id/shareViaLinkFileListingPermissionSwitch"
                         android:layout_toStartOf="@id/shareViaLinkFileListingPermissionSwitch"
                         android:padding="@dimen/standard_half_padding"
                         android:text="@string/share_via_link_hide_file_listing_permission_label"
@@ -244,7 +228,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
                         android:layout_alignParentTop="true"
                         android:padding="@dimen/standard_half_padding"
                         />
@@ -253,9 +236,7 @@
                         android:id="@+id/shareViaLinkPasswordLabel"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:layout_toLeftOf="@id/shareViaLinkPasswordSwitch"
                         android:layout_toStartOf="@id/shareViaLinkPasswordSwitch"
                         android:paddingLeft="@dimen/standard_half_padding"
                         android:paddingRight="@dimen/standard_half_padding"
@@ -269,10 +250,8 @@
                         android:id="@+id/shareViaLinkPasswordValue"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:layout_below="@id/shareViaLinkPasswordLabel"
-                        android:layout_toLeftOf="@id/shareViaLinkPasswordSwitch"
                         android:layout_toStartOf="@id/shareViaLinkPasswordSwitch"
                         android:paddingBottom="@dimen/standard_half_padding"
                         android:paddingLeft="@dimen/standard_half_padding"
@@ -295,7 +274,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-                        android:layout_alignParentRight="true"
                         android:layout_alignParentTop="true"
                         android:checked="false"
                         android:padding="@dimen/standard_half_padding"/>
@@ -304,9 +282,7 @@
                         android:id="@+id/shareViaLinkExpirationLabel"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
-                        android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
                         android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
                         android:paddingLeft="@dimen/standard_half_padding"
                         android:paddingRight="@dimen/standard_half_padding"
@@ -320,10 +296,8 @@
                         android:id="@+id/shareViaLinkExpirationValue"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
                         android:layout_alignParentStart="true"
                         android:layout_below="@id/shareViaLinkExpirationLabel"
-                        android:layout_toLeftOf="@id/shareViaLinkExpirationSwitch"
                         android:layout_toStartOf="@id/shareViaLinkExpirationSwitch"
                         android:paddingBottom="@dimen/standard_half_padding"
                         android:paddingLeft="@dimen/standard_half_padding"

src/main/res/layout/share_user_item.xml

@@ -41,7 +41,6 @@
             android:textSize="@dimen/two_line_primary_text_size"
             android:text="@string/username"
             android:id="@+id/userOrGroupName"
-            android:layout_marginLeft="@dimen/standard_half_margin"
             android:layout_marginStart="@dimen/standard_half_margin"
             android:textColor="@color/text_color"
             android:singleLine="true"

src/main/res/layout/sorting_order_fragment.xml

@@ -55,9 +55,7 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
-                    android:paddingRight="@dimen/standard_half_padding"
                     android:paddingEnd="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:src="@drawable/ic_alphabetical_asc"
@@ -72,10 +70,8 @@
                     android:ellipsize="middle"
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingRight="@dimen/standard_double_padding"
                     android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingStart="@dimen/zero"
-                    android:paddingLeft="@dimen/zero"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_name_a_z"
                     android:textColor="@color/standard_grey"
@@ -94,9 +90,7 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
-                    android:paddingRight="@dimen/standard_half_padding"
                     android:paddingEnd="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:src="@drawable/ic_alphabetical_desc"
@@ -111,9 +105,7 @@
                     android:ellipsize="middle"
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingRight="@dimen/standard_double_padding"
                     android:paddingEnd="@dimen/standard_double_padding"
-                    android:paddingLeft="@dimen/zero"
                     android:paddingStart="@dimen/zero"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_name_z_a"
@@ -134,9 +126,7 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
-                    android:paddingRight="@dimen/standard_half_padding"
                     android:paddingEnd="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:src="@drawable/ic_modification_desc"
@@ -151,10 +141,8 @@
                     android:ellipsize="middle"
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingRight="@dimen/standard_double_padding"
                     android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingStart="@dimen/zero"
-                    android:paddingLeft="@dimen/zero"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_date_newest_first"
                     android:textColor="@color/standard_grey"
@@ -173,9 +161,7 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
-                    android:paddingRight="@dimen/standard_half_padding"
                     android:paddingEnd="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:src="@drawable/ic_modification_asc"
@@ -190,10 +176,8 @@
                     android:ellipsize="middle"
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingRight="@dimen/standard_double_padding"
                     android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingStart="@dimen/zero"
-                    android:paddingLeft="@dimen/zero"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_date_oldest_first"
                     android:textColor="@color/standard_grey"
@@ -214,9 +198,7 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
-                    android:paddingRight="@dimen/standard_half_padding"
                     android:paddingEnd="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:src="@drawable/ic_size_desc"
@@ -231,10 +213,8 @@
                     android:ellipsize="middle"
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingRight="@dimen/standard_double_padding"
                     android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingStart="@dimen/zero"
-                    android:paddingLeft="@dimen/zero"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_size_biggest_first"
                     android:textColor="@color/standard_grey"
@@ -253,9 +233,7 @@
                     android:layout_gravity="center_vertical"
                     android:background="@color/bg_default"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingLeft="@dimen/standard_padding"
                     android:paddingStart="@dimen/standard_padding"
-                    android:paddingRight="@dimen/standard_half_padding"
                     android:paddingEnd="@dimen/standard_half_padding"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:src="@drawable/ic_size_asc"
@@ -270,10 +248,8 @@
                     android:ellipsize="middle"
                     android:singleLine="true"
                     android:paddingBottom="@dimen/standard_half_padding"
-                    android:paddingRight="@dimen/standard_double_padding"
                     android:paddingEnd="@dimen/standard_double_padding"
                     android:paddingStart="@dimen/zero"
-                    android:paddingLeft="@dimen/zero"
                     android:paddingTop="@dimen/standard_half_padding"
                     android:text="@string/menu_item_sort_by_size_smallest_first"
                     android:textColor="@color/standard_grey"

src/main/res/layout/ssl_untrusted_cert_layout.xml

@@ -41,11 +41,9 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="0"
 		android:layout_gravity="start"
-		android:paddingLeft="@dimen/standard_half_padding"
-		android:paddingStart="@dimen/standard_half_padding"
+        android:paddingStart="@dimen/standard_half_padding"
 		android:paddingEnd="@dimen/zero"
-		android:paddingRight="@dimen/zero"
-		android:text="@string/ssl_validator_reason_cert_not_trusted"
+        android:text="@string/ssl_validator_reason_cert_not_trusted"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
 
@@ -55,11 +53,9 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="start"
-		android:paddingLeft="@dimen/standard_half_padding"
-		android:paddingStart="@dimen/standard_half_padding"
+        android:paddingStart="@dimen/standard_half_padding"
 		android:paddingEnd="@dimen/zero"
-		android:paddingRight="@dimen/zero"
-		android:text="@string/ssl_validator_reason_cert_expired"
+        android:text="@string/ssl_validator_reason_cert_expired"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
 
@@ -68,11 +64,9 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="start"
-		android:paddingLeft="@dimen/standard_half_padding"
-		android:paddingStart="@dimen/standard_half_padding"
+        android:paddingStart="@dimen/standard_half_padding"
 		android:paddingEnd="@dimen/zero"
-		android:paddingRight="@dimen/zero"
-		android:text="@string/ssl_validator_reason_cert_not_yet_valid"
+        android:text="@string/ssl_validator_reason_cert_not_yet_valid"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
 
@@ -80,11 +74,9 @@
 		android:id="@+id/reason_hostname_not_verified"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:paddingLeft="@dimen/standard_half_padding"
-		android:paddingStart="@dimen/standard_half_padding"
+        android:paddingStart="@dimen/standard_half_padding"
 		android:paddingEnd="@dimen/zero"
-		android:paddingRight="@dimen/zero"
-		android:text="@string/ssl_validator_reason_hostname_not_verified"
+        android:text="@string/ssl_validator_reason_hostname_not_verified"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
 
@@ -92,10 +84,8 @@
 		android:id="@+id/reason_no_info_about_error"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:paddingLeft="@dimen/standard_half_padding"
-		android:paddingStart="@dimen/standard_half_padding"
-		android:paddingRight="@dimen/zero"
-		android:paddingEnd="@dimen/zero"
+        android:paddingStart="@dimen/standard_half_padding"
+        android:paddingEnd="@dimen/zero"
 		android:text="@string/ssl_validator_no_info_about_error"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -121,11 +111,9 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="start"
-				android:paddingLeft="@dimen/ssl_untrusted_cert_layout_padding"
-				android:paddingStart="@dimen/ssl_untrusted_cert_layout_padding"
+                android:paddingStart="@dimen/ssl_untrusted_cert_layout_padding"
 				android:paddingEnd="@dimen/zero"
-				android:paddingRight="@dimen/zero"
-				android:text="@string/ssl_validator_null_cert"
+                android:text="@string/ssl_validator_null_cert"
 				android:textAppearance="?android:attr/textAppearanceSmall" />
 
 				<TextView

src/main/res/layout/ssl_validator_layout.xml

@@ -39,10 +39,8 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="start"
-		android:paddingLeft="@dimen/standard_half_padding"
-		android:paddingStart="@dimen/standard_half_padding"
-		android:paddingRight="@dimen/zero"
-		android:paddingEnd="@dimen/zero"
+        android:paddingStart="@dimen/standard_half_padding"
+        android:paddingEnd="@dimen/zero"
 		android:text="@string/ssl_validator_reason_cert_not_trusted"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -52,10 +50,8 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="start"
-		android:paddingLeft="@dimen/standard_half_padding"
-		android:paddingStart="@dimen/standard_half_padding"
-		android:paddingRight="@dimen/zero"
-		android:paddingEnd="@dimen/zero"
+        android:paddingStart="@dimen/standard_half_padding"
+        android:paddingEnd="@dimen/zero"
 		android:text="@string/ssl_validator_reason_cert_expired"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -65,10 +61,8 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="start"
-		android:paddingLeft="@dimen/standard_half_padding"
-		android:paddingStart="@dimen/standard_half_padding"
-		android:paddingRight="@dimen/zero"
-		android:paddingEnd="@dimen/zero"
+        android:paddingStart="@dimen/standard_half_padding"
+        android:paddingEnd="@dimen/zero"
 		android:text="@string/ssl_validator_reason_cert_not_yet_valid"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
@@ -78,10 +72,8 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="start"
-		android:paddingLeft="@dimen/standard_half_padding"
-		android:paddingStart="@dimen/standard_half_padding"
-		android:paddingRight="@dimen/zero"
-		android:paddingEnd="@dimen/zero"
+        android:paddingStart="@dimen/standard_half_padding"
+        android:paddingEnd="@dimen/zero"
 		android:text="@string/ssl_validator_reason_hostname_not_verified"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />

src/main/res/layout/storage_path_item.xml

@@ -45,7 +45,6 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_marginEnd="@dimen/standard_margin"
-        android:layout_marginRight="@dimen/standard_margin"
         android:layout_weight="1"
         android:ellipsize="end"
         android:gravity="center_vertical"

src/main/res/layout/synced_folders_item_header.xml

@@ -25,8 +25,6 @@
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/alternate_half_padding"
     android:paddingEnd="@dimen/zero"
-    android:paddingLeft="@dimen/standard_padding"
-    android:paddingRight="@dimen/zero"
     android:paddingStart="@dimen/standard_padding"
     android:paddingTop="@dimen/alternate_half_padding">
 
@@ -35,10 +33,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/buttonBar"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignTop="@+id/buttonBar"
-        android:layout_toLeftOf="@+id/buttonBar"
         android:layout_toStartOf="@+id/buttonBar"
         tools:ignore="UseCompoundDrawables">
 
@@ -48,7 +44,6 @@
             android:layout_height="@dimen/synced_folders_item_type_layout_height"
             android:layout_gravity="start|center_vertical"
             android:layout_marginEnd="@dimen/synced_folders_item_type_layout_right_end_margin"
-            android:layout_marginRight="@dimen/synced_folders_item_type_layout_right_end_margin"
             android:contentDescription="@string/synced_folders_type"
             android:src="@drawable/image_32dp" />
 
@@ -68,8 +63,7 @@
         android:id="@+id/buttonBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true">
+        android:layout_alignParentEnd="true">
 
         <ImageButton
             android:id="@+id/syncStatusButton"
@@ -92,8 +86,6 @@
             android:focusable="true"
             android:paddingBottom="@dimen/standard_half_padding"
             android:paddingEnd="@dimen/standard_padding"
-            android:paddingLeft="@dimen/standard_half_padding"
-            android:paddingRight="@dimen/standard_padding"
             android:paddingStart="@dimen/standard_half_padding"
             android:paddingTop="@dimen/standard_half_padding"
             android:src="@drawable/ic_dots_vertical" />

src/main/res/layout/synced_folders_settings_layout.xml

@@ -108,7 +108,6 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/local_folder_title"
                         android:layout_alignStart="@id/local_folder_title"
-                        android:layout_alignLeft="@id/local_folder_title"
                         android:ellipsize="middle"
                         android:maxLines="2"
                         android:text="@string/choose_local_folder"
@@ -160,7 +159,6 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/remote_folder_title"
                         android:layout_alignStart="@id/remote_folder_title"
-                        android:layout_alignLeft="@id/remote_folder_title"
                         android:ellipsize="middle"
                         android:maxLines="2"
                         android:text="@string/choose_remote_folder"
@@ -330,7 +328,6 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/setting_instant_upload_path_use_subfolders_label"
                         android:layout_alignStart="@id/setting_instant_upload_path_use_subfolders_label"
-                        android:layout_alignLeft="@id/setting_instant_upload_path_use_subfolders_label"
                         android:ellipsize="end"
                         android:maxLines="2"
                         android:text="@string/prefs_instant_upload_path_use_subfolders_summary"
@@ -398,14 +395,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
             android:text="@string/common_delete" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true">
+            android:layout_alignParentEnd="true">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/cancel"

src/main/res/layout/text_file_preview.xml

@@ -59,10 +59,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_gravity="end|bottom"
         android:layout_marginEnd="@dimen/standard_margin"
-        android:layout_marginRight="@dimen/standard_margin"
         android:layout_marginBottom="@dimen/standard_margin"
         android:contentDescription="@string/edit_rich_workspace"
         android:visibility="gone" />

src/main/res/layout/toolbar_user_information.xml

@@ -55,8 +55,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/toolbar_user_information_layout_margin"
                 android:layout_marginEnd="@dimen/standard_half_margin"
-                android:layout_marginLeft="@dimen/toolbar_user_information_layout_margin"
-                android:layout_marginRight="@dimen/standard_half_margin"
                 android:layout_marginStart="@dimen/toolbar_user_information_layout_margin"
                 android:gravity="bottom"
                 android:orientation="horizontal"
@@ -82,7 +80,6 @@
                     android:layout_marginLeft="@dimen/standard_half_margin"
                     android:layout_marginRight="@dimen/standard_half_margin"
                     android:layout_toEndOf="@id/avatar_container"
-                    android:layout_toRightOf="@id/avatar_container"
                     android:orientation="vertical">
 
                     <TextView

src/main/res/layout/trashbin_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?><!--
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
@@ -79,8 +78,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingEnd="@dimen/standard_quarter_padding"
-                    android:paddingLeft="@dimen/zero"
-                    android:paddingRight="@dimen/standard_quarter_padding"
                     android:paddingStart="@dimen/zero"
                     android:text="@string/info_separator"
                     android:textColor="@color/list_item_lastmod_and_filesize_text"
@@ -110,8 +107,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingEnd="@dimen/zero"
-            android:paddingLeft="@dimen/standard_half_padding"
-            android:paddingRight="@dimen/zero"
             android:paddingStart="@dimen/standard_half_padding">
 
             <ImageView
@@ -123,8 +118,6 @@
                 android:contentDescription="@string/restore_button_description"
                 android:focusable="false"
                 android:paddingEnd="@dimen/list_item_share_right_margin"
-                android:paddingLeft="@dimen/standard_half_padding"
-                android:paddingRight="@dimen/list_item_share_right_margin"
                 android:paddingStart="@dimen/standard_half_padding"
                 android:src="@drawable/ic_history"/>
 
@@ -134,13 +127,10 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/restore"
-                android:layout_toRightOf="@id/restore"
                 android:clickable="false"
                 android:contentDescription="@string/checkbox"
                 android:focusable="false"
                 android:paddingEnd="@dimen/alternate_padding"
-                android:paddingLeft="@dimen/standard_half_padding"
-                android:paddingRight="@dimen/alternate_padding"
                 android:paddingStart="@dimen/standard_half_padding"
                 android:src="@drawable/ic_checkbox_blank_outline"/>
 
@@ -150,7 +140,6 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/customCheckbox"
-                android:layout_toRightOf="@id/customCheckbox"
                 android:clickable="true"
                 android:contentDescription="@string/overflow_menu"
                 android:focusable="true"

src/main/res/layout/upload_files_layout.xml

@@ -84,7 +84,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/standard_half_margin"
-            android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_weight="1"
             android:text="@string/common_cancel"
             style="@style/OutlinedButton"

src/main/res/layout/upload_list_header.xml

@@ -34,9 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_toStartOf="@id/upload_list_action"
-        android:layout_toLeftOf="@id/upload_list_action"
         android:ellipsize="middle"
         android:padding="@dimen/standard_half_padding"
         android:textColor="@color/color_accent"
@@ -47,13 +45,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:contentDescription="@string/delete_entries"
         android:paddingStart="@dimen/standard_half_padding"
-        android:paddingLeft="@dimen/standard_half_padding"
         android:paddingTop="@dimen/standard_half_padding"
         android:paddingEnd="@dimen/zero"
-        android:paddingRight="@dimen/zero"
         android:paddingBottom="@dimen/standard_half_padding"
         android:src="@drawable/nav_trashbin" />
 </RelativeLayout>

src/main/res/layout/upload_list_item.xml

@@ -135,8 +135,6 @@
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:paddingEnd="@dimen/zero"
-        android:paddingLeft="@dimen/standard_half_padding"
-        android:paddingRight="@dimen/zero"
         android:paddingStart="@dimen/standard_half_padding">
 
         <ImageButton

src/main/res/layout/uploader_layout.xml

@@ -71,7 +71,6 @@
             android:layout_gravity="bottom"
             android:layout_weight="1"
             android:text="@string/common_cancel"
-            android:layout_marginRight="@dimen/standard_half_margin"
             android:layout_marginEnd="@dimen/standard_half_margin"
             app:cornerRadius="@dimen/button_corner_radius" />
 

src/main/res/layout/uploader_list_item_layout.xml

@@ -43,9 +43,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/zero"
             android:layout_marginStart="@dimen/zero"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:ellipsize="middle"
             android:singleLine="true"
@@ -56,9 +54,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/zero"
             android:layout_marginStart="@dimen/zero"
-            android:layout_marginRight="@dimen/standard_quarter_margin"
             android:layout_marginEnd="@dimen/standard_quarter_margin"
             android:orientation="horizontal">
 
@@ -75,8 +71,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="@dimen/zero"
-                android:paddingLeft="@dimen/zero"
-                android:paddingRight="@dimen/standard_quarter_padding"
                 android:paddingEnd="@dimen/standard_quarter_padding"
                 android:gravity="end"
                 android:text="@string/info_separator"

src/main/res/layout/user_info_details_table_item.xml

@@ -29,8 +29,6 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/standard_margin"
         android:layout_marginEnd="@dimen/standard_half_margin"
-        android:layout_marginLeft="@dimen/standard_icon_list_horizontal_margin"
-        android:layout_marginRight="@dimen/standard_half_margin"
         android:layout_marginStart="@dimen/standard_icon_list_horizontal_margin"
         android:layout_marginTop="@dimen/standard_margin"
         android:contentDescription="@string/account_icon"
@@ -43,7 +41,6 @@
         android:layout_centerInParent="true"
         android:layout_margin="@dimen/standard_margin"
         android:layout_toEndOf="@id/icon"
-        android:layout_toRightOf="@id/icon"
         android:maxLines="3"
         android:textAppearance="?android:attr/textAppearanceListItem"
         tools:text="+49 123 456 789 12" />

src/main/res/layout/user_info_layout.xml

@@ -33,7 +33,6 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">

src/main/res/layout/version_list_item.xml

@@ -5,17 +5,17 @@
   @author Tobias Kaminsky
   Copyright (C) 2018 Tobias Kaminsky
   Copyright (C) 2018 Nextcloud GmbH.
- 
+
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
- 
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU General Public License for more details.
- 
+
   You should have received a copy of the GNU General Public License
   along with this program. If not, see <https://www.gnu.org/licenses/>.
 -->
@@ -36,7 +36,6 @@
         android:layout_width="@dimen/activity_icon_width"
         android:layout_height="@dimen/activity_icon_height"
         android:layout_marginEnd="@dimen/activity_icon_layout_right_end_margin"
-        android:layout_marginRight="@dimen/activity_icon_layout_right_end_margin"
         android:alpha="0.5"
         android:contentDescription="@null"
         android:src="@drawable/ic_activity"/>
@@ -69,7 +68,6 @@
         android:layout_width="@dimen/restore_icon_width"
         android:layout_height="@dimen/restore_icon_height"
         android:layout_marginEnd="@dimen/restore_icon_layout_right_end_margin"
-        android:layout_marginRight="@dimen/restore_icon_layout_right_end_margin"
         android:layout_weight="1"
         android:alpha="0.5"
         android:contentDescription="@string/restore"

src/main/res/values/dims.xml

@@ -48,7 +48,6 @@
     <dimen name="two_line_primary_text_size">16sp</dimen>
     <dimen name="two_line_secondary_text_size">14sp</dimen>
     <dimen name="list_item_avatar_icon_margin">20dp</dimen>
-    <dimen name="list_item_avatar_text_margin">20dp</dimen>
     <dimen name="list_item_share_right_margin">12dp</dimen>
     <dimen name="file_list_item_avatar_icon_radius">10dp</dimen>
     <dimen name="account_action_layout_height">72dp</dimen>