moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-11 20:50:19 -05:00
Code Issues Releases Wiki Activity

Now that we have multiselect mode, kill the "quick delete" mode.

Browse Source
This commit is contained in:
Jesse Vincent 2009-11-28 05:09:28 +00:00
parent 72ca05e1bd
commit 900bcb434c
2 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/message_list_widgets.xml
View File

@ -5,15 +5,6 @@
android:layout_width="30dip" android:layout_width="30dip"
android:layout_height="30dip" android:layout_height="30dip"
> >
<ImageButton
android:id="@+id/delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:focusable="true"
style="?android:attr/buttonStyleSmall"
android:src="@drawable/ic_delete"
/>
<CheckBox <CheckBox
android:id="@+id/flagged" android:id="@+id/flagged"
android:layout_width="wrap_content" android:layout_width="wrap_content"

45
src/com/android/email/activity/MessageList.java
View File

@ -34,7 +34,6 @@ import android.widget.BaseAdapter;
import android.widget.ListView; import android.widget.ListView;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.ImageButton;
import android.widget.Toast; import android.widget.Toast;
import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.AdapterContextMenuInfo;
@ -94,8 +93,7 @@ public class MessageList
private static final int WIDGET_NONE = 1; private static final int WIDGET_NONE = 1;
private static final int WIDGET_FLAG = 2; private static final int WIDGET_FLAG = 2;
private static final int WIDGET_DELETE = 3; private static final int WIDGET_MULTISELECT = 3;
private static final int WIDGET_MULTISELECT = 4;
private static final int[] colorChipResIds = new int[] private static final int[] colorChipResIds = new int[]
{ {
@ -706,11 +704,6 @@ public class MessageList
switch (mSelectedWidget) switch (mSelectedWidget)
{ {
case WIDGET_FLAG: case WIDGET_FLAG:
{
mSelectedWidget = WIDGET_DELETE;
break;
}
case WIDGET_DELETE:
{ {
mSelectedWidget = WIDGET_MULTISELECT; mSelectedWidget = WIDGET_MULTISELECT;
showBatchButtons(); showBatchButtons();
@ -746,15 +739,10 @@ public class MessageList
break; break;
} }
case WIDGET_MULTISELECT: case WIDGET_MULTISELECT:
{
mSelectedWidget=WIDGET_DELETE;
hideBatchButtons();
break;
}
case WIDGET_DELETE:
{ {
mSelectedWidget=WIDGET_FLAG; mSelectedWidget=WIDGET_FLAG;
hideBatchButtons();
break;
} }
} }
@ -773,11 +761,10 @@ public class MessageList
private void setVisibleWidgetsForListItem(View v, int nextWidget) private void setVisibleWidgetsForListItem(View v, int nextWidget)
{ {
ImageButton delete = (ImageButton) v.findViewById(R.id.delete);
Button flagged = (Button) v.findViewById(R.id.flagged); Button flagged = (Button) v.findViewById(R.id.flagged);
CheckBox selected = (CheckBox) v.findViewById(R.id.selected_checkbox); CheckBox selected = (CheckBox) v.findViewById(R.id.selected_checkbox);
if (flagged == null || delete == null || selected == null) if (flagged == null || selected == null)
{ {
return; return;
} }
@ -794,23 +781,14 @@ public class MessageList
if (nextWidget == WIDGET_DELETE) if (nextWidget == WIDGET_MULTISELECT)
{
flagged.setVisibility(View.GONE);
delete.setVisibility(View.VISIBLE);
selected.setVisibility(View.GONE);
}
else if (nextWidget == WIDGET_MULTISELECT)
{ {
flagged.setVisibility(View.GONE); flagged.setVisibility(View.GONE);
delete.setVisibility(View.GONE);
selected.setVisibility(View.VISIBLE); selected.setVisibility(View.VISIBLE);
} }
else else
{ {
flagged.setVisibility(View.VISIBLE); flagged.setVisibility(View.VISIBLE);
delete.setVisibility(View.GONE);
selected.setVisibility(View.GONE); selected.setVisibility(View.GONE);
} }
} }
@ -1805,17 +1783,6 @@ public class MessageList
} }
holder.delete = (ImageButton) view.findViewById(R.id.delete);
holder.delete.setOnClickListener(new OnClickListener()
{
public void onClick(View v)
{
// Perform action on clicks
MessageInfoHolder message = (MessageInfoHolder) getItem((Integer)v.getTag());
onDelete(message, (Integer)v.getTag());
}
});
if (message != null) if (message != null)
{ {
holder.chip.getBackground().setAlpha(message.read ? 0 : 255); holder.chip.getBackground().setAlpha(message.read ? 0 : 255);
@ -1828,7 +1795,6 @@ public class MessageList
setVisibleWidgetsForListItem(view, mSelectedWidget); setVisibleWidgetsForListItem(view, mSelectedWidget);
// XXX TODO there has to be some way to walk our view hierarchy and get this // XXX TODO there has to be some way to walk our view hierarchy and get this
holder.flagged.setTag((Integer)position); holder.flagged.setTag((Integer)position);
holder.delete.setTag((Integer)position);
holder.flagged.setChecked(message.flagged); holder.flagged.setChecked(message.flagged);
@ -2139,7 +2105,6 @@ public class MessageList
public TextView from; public TextView from;
public TextView date; public TextView date;
public CheckBox flagged; public CheckBox flagged;
public ImageButton delete;
public View chip; public View chip;
public CheckBox selected; public CheckBox selected;
public int position = -1; public int position = -1;