further cleanup after rebase

src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java

@@ -37,7 +37,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.datamodel.MediaFolder;
 import com.owncloud.android.datamodel.SyncedFolderDisplayItem;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
-import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.ThemeUtils;
 
 import java.io.File;
@@ -108,7 +107,6 @@ public class SyncedFolderAdapter extends SectionedRecyclerViewAdapter<SyncedFold
     @Override
     public void onBindHeaderViewHolder(final MainViewHolder holder, final int section) {
         holder.mainHeaderContainer.setVisibility(View.VISIBLE);
-        holder.customFolderHeaderContainer.setVisibility(View.GONE);
 
         holder.title.setText(mSyncFolderItems.get(section).getFolderName());
 
@@ -207,12 +205,10 @@ public class SyncedFolderAdapter extends SectionedRecyclerViewAdapter<SyncedFold
         private final ImageView thumbnailDarkener;
 
         private final RelativeLayout mainHeaderContainer;
-        private final RelativeLayout customFolderHeaderContainer;
 
         private MainViewHolder(View itemView) {
             super(itemView);
             mainHeaderContainer = (RelativeLayout) itemView.findViewById(R.id.header_container);
-            customFolderHeaderContainer = (RelativeLayout) itemView.findViewById(R.id.custom_folder);
             image = (ImageView) itemView.findViewById(R.id.thumbnail);
             title = (TextView) itemView.findViewById(R.id.title);
             type = (ImageView) itemView.findViewById(R.id.type);

src/main/res/layout/synced_folders_item_header.xml

@@ -45,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
                 android:paddingRight="@dimen/standard_half_padding"
-                android:src="@drawable/ic_account_plus"/>
+                android:src="@drawable/ic_image_18dp"/>
 
             <TextView
                 android:id="@+id/title"
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|center_vertical"
                 android:ellipsize="middle"
-                android:text="Header Text"
+                android:text="@string/placeholder_filename"
                 android:textColor="?android:textColorPrimary"
                 android:textStyle="bold"/>
 
@@ -88,31 +88,4 @@
         </LinearLayout>
     </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/custom_folder"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp">
-
-        <ImageView
-            android:id="@+id/custom_folder_iv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toLeftOf="@+id/custom_folder_tv"
-            android:paddingRight="4dp"
-            android:paddingLeft="4dp"
-            android:clickable="false"
-            android:background="@color/transparent"
-            android:src="@drawable/ic_folder_star_24dp"/>
-
-        <TextView
-            android:id="@+id/custom_folder_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:clickable="false"
-            android:text="@string/autoupload_custom_folder"/>
-    </RelativeLayout>
-
 </RelativeLayout>