mirror of
https://github.com/moparisthebest/k-9
synced 2024-08-13 17:03:48 -04:00
Revert "http://code.google.com/p/k9mail/issues/detail?id=2682" until we
can make it configurable, per discussion with Marcus This reverts commit 1436eeefa292f64c8c9aa6ec9fa2daaeafeb93fd.
This commit is contained in:
parent
15bf83bbe4
commit
dbc07d14ee
Binary file not shown.
Before Width: | Height: | Size: 1.4 KiB |
@ -30,13 +30,6 @@
|
|||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:src="@drawable/ic_button_delete"
|
android:src="@drawable/ic_button_delete"
|
||||||
/>
|
/>
|
||||||
<ImageButton
|
|
||||||
android:id="@+id/batch_spam_button"
|
|
||||||
android:layout_width="0dip"
|
|
||||||
android:layout_height="fill_parent"
|
|
||||||
android:layout_weight="1"
|
|
||||||
android:src="@drawable/ic_button_spam"
|
|
||||||
/>
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/batch_flag_button"
|
android:id="@+id/batch_flag_button"
|
||||||
android:layout_width="0dip"
|
android:layout_width="0dip"
|
||||||
|
@ -314,14 +314,9 @@ public class MessageList
|
|||||||
private boolean mCheckboxes = true;
|
private boolean mCheckboxes = true;
|
||||||
private int mSelectedCount = 0;
|
private int mSelectedCount = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
* Area with buttons visible when multiple
|
|
||||||
* mails are marked.
|
|
||||||
*/
|
|
||||||
private View mBatchButtonArea;
|
private View mBatchButtonArea;
|
||||||
private ImageButton mBatchReadButton;
|
private ImageButton mBatchReadButton;
|
||||||
private ImageButton mBatchDeleteButton;
|
private ImageButton mBatchDeleteButton;
|
||||||
private ImageButton mBatchSpamButton;
|
|
||||||
private ImageButton mBatchFlagButton;
|
private ImageButton mBatchFlagButton;
|
||||||
private ImageButton mBatchDoneButton;
|
private ImageButton mBatchDoneButton;
|
||||||
|
|
||||||
@ -907,13 +902,10 @@ public class MessageList
|
|||||||
mBatchReadButton.setOnClickListener(this);
|
mBatchReadButton.setOnClickListener(this);
|
||||||
mBatchDeleteButton = (ImageButton) findViewById(R.id.batch_delete_button);
|
mBatchDeleteButton = (ImageButton) findViewById(R.id.batch_delete_button);
|
||||||
mBatchDeleteButton.setOnClickListener(this);
|
mBatchDeleteButton.setOnClickListener(this);
|
||||||
mBatchSpamButton = (ImageButton) findViewById(R.id.batch_spam_button);
|
|
||||||
mBatchSpamButton.setOnClickListener(this);
|
|
||||||
mBatchFlagButton = (ImageButton) findViewById(R.id.batch_flag_button);
|
mBatchFlagButton = (ImageButton) findViewById(R.id.batch_flag_button);
|
||||||
mBatchFlagButton.setOnClickListener(this);
|
mBatchFlagButton.setOnClickListener(this);
|
||||||
mBatchDoneButton = (ImageButton) findViewById(R.id.batch_done_button);
|
mBatchDoneButton = (ImageButton) findViewById(R.id.batch_done_button);
|
||||||
|
|
||||||
|
|
||||||
mBatchDoneButton.setOnClickListener(this);
|
mBatchDoneButton.setOnClickListener(this);
|
||||||
|
|
||||||
// Gesture detection
|
// Gesture detection
|
||||||
@ -2970,18 +2962,6 @@ public class MessageList
|
|||||||
Animation animation = AnimationUtils.loadAnimation(this, R.anim.footer_appear);
|
Animation animation = AnimationUtils.loadAnimation(this, R.anim.footer_appear);
|
||||||
animation.setAnimationListener(this);
|
animation.setAnimationListener(this);
|
||||||
mBatchButtonArea.startAnimation(animation);
|
mBatchButtonArea.startAnimation(animation);
|
||||||
|
|
||||||
|
|
||||||
// hide spam button if there is no spam folder
|
|
||||||
if (mAccount != null)
|
|
||||||
{
|
|
||||||
String folderName = mAccount.getSpamFolderName();
|
|
||||||
if (K9.FOLDER_NONE.equalsIgnoreCase(folderName)
|
|
||||||
|| !mController.isMoveCapable(mAccount))
|
|
||||||
{
|
|
||||||
mBatchSpamButton.setVisibility(View.GONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3100,7 +3080,6 @@ public class MessageList
|
|||||||
{
|
{
|
||||||
boolean newState = false;
|
boolean newState = false;
|
||||||
List<Message> messageList = new ArrayList<Message>();
|
List<Message> messageList = new ArrayList<Message>();
|
||||||
// messages to be removed from the view
|
|
||||||
List<MessageInfoHolder> removeHolderList = new ArrayList<MessageInfoHolder>();
|
List<MessageInfoHolder> removeHolderList = new ArrayList<MessageInfoHolder>();
|
||||||
|
|
||||||
if (v == mBatchDoneButton)
|
if (v == mBatchDoneButton)
|
||||||
@ -3128,10 +3107,6 @@ public class MessageList
|
|||||||
{
|
{
|
||||||
removeHolderList.add(holder);
|
removeHolderList.add(holder);
|
||||||
}
|
}
|
||||||
else if (v == mBatchSpamButton)
|
|
||||||
{
|
|
||||||
removeHolderList.add(holder);
|
|
||||||
}
|
|
||||||
else if (v == mBatchFlagButton)
|
else if (v == mBatchFlagButton)
|
||||||
{
|
{
|
||||||
holder.flagged = newState;
|
holder.flagged = newState;
|
||||||
@ -3154,17 +3129,6 @@ public class MessageList
|
|||||||
mSelectedCount = 0;
|
mSelectedCount = 0;
|
||||||
toggleBatchButtons();
|
toggleBatchButtons();
|
||||||
}
|
}
|
||||||
else if (v == mBatchSpamButton)
|
|
||||||
{
|
|
||||||
String folderName = mAccount.getSpamFolderName();
|
|
||||||
if (K9.FOLDER_NONE.equalsIgnoreCase(folderName))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
mController.moveMessages(mAccount, mCurrentFolder.name, messageList.toArray(EMPTY_MESSAGE_ARRAY), folderName, null);
|
|
||||||
mSelectedCount = 0;
|
|
||||||
toggleBatchButtons();
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mController.setFlag(messageList.toArray(EMPTY_MESSAGE_ARRAY), (v == mBatchReadButton ? Flag.SEEN : Flag.FLAGGED), newState);
|
mController.setFlag(messageList.toArray(EMPTY_MESSAGE_ARRAY), (v == mBatchReadButton ? Flag.SEEN : Flag.FLAGGED), newState);
|
||||||
|
Loading…
Reference in New Issue
Block a user