From 8ff282a260eef699c3e22e8809075191706a171a Mon Sep 17 00:00:00 2001
From: mindyp <mindyp@google.com>
Date: Tue, 18 Sep 2012 15:44:24 -0700
Subject: [PATCH] Lots of fixes to line up with new multi/single move to folder
 dialog.

This leaves the picker with radion buttons for choosing the trash
and sent folders for imap.

Change-Id: I11bf32458b4d91bd21f2baf9260a69ac13026aaa
---
 src/com/android/email/provider/FolderPickerDialog.java        | 4 ++--
 .../android/email/provider/FolderPickerSelectorAdapter.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/email/provider/FolderPickerDialog.java b/src/com/android/email/provider/FolderPickerDialog.java
index bf9a4e2e6..d17af8e20 100644
--- a/src/com/android/email/provider/FolderPickerDialog.java
+++ b/src/com/android/email/provider/FolderPickerDialog.java
@@ -64,8 +64,8 @@ public class FolderPickerDialog implements OnClickListener, OnMultiChoiceClickLi
             mAdapter = new SeparatedFolderListAdapter(context);
             String[] headers = context.getResources()
                     .getStringArray(R.array.moveto_folder_sections);
-            mAdapter.addSection(new FolderPickerSelectorAdapter(context,
-                    foldersCursor, new HashSet<String>(), true, headers[2]));
+            mAdapter.addSection(new FolderPickerSelectorAdapter(context, foldersCursor,
+                    new HashSet<String>(), R.layout.radiobutton_single_folders_view, headers[2]));
             builder.setAdapter(mAdapter, this);
         } finally {
             foldersCursor.close();
diff --git a/src/com/android/email/provider/FolderPickerSelectorAdapter.java b/src/com/android/email/provider/FolderPickerSelectorAdapter.java
index aa91670b5..c88f7c8f1 100644
--- a/src/com/android/email/provider/FolderPickerSelectorAdapter.java
+++ b/src/com/android/email/provider/FolderPickerSelectorAdapter.java
@@ -30,8 +30,8 @@ import java.util.Set;
 public class FolderPickerSelectorAdapter extends HierarchicalFolderSelectorAdapter {
 
     public FolderPickerSelectorAdapter(Context context, Cursor folders,
-            Set<String> initiallySelected, boolean single, String header) {
-        super(context, folders, initiallySelected, single, header);
+            Set<String> initiallySelected, int layout, String header) {
+        super(context, folders, initiallySelected, layout, header);
     }
 
     /**