moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 13:12:25 -05:00
Code Issues Releases Wiki Activity

Added a "show no widgets" entry into the widgets rotation.

Browse Source 
Eventually, we should have a preference per account for whether listview
starts in no-widgets or flag mode.
This commit is contained in:
Jesse Vincent 2009-11-25 16:21:01 +00:00
parent b50baac5e8
commit e4427f4f17
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/message_list_item.xml
View File

@ -25,6 +25,7 @@
android:paddingLeft="10dip" android:paddingLeft="10dip"
android:layout_toLeftOf="@id/widgets" android:layout_toLeftOf="@id/widgets"
android:layout_toRightOf="@+id/chip" android:layout_toRightOf="@+id/chip"
android:layout_alignWithParentIfMissing="true"
android:layout_marginRight="1dip" /> android:layout_marginRight="1dip" />
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
@ -39,7 +40,7 @@
android:layout_toLeftOf="@id/widgets" android:layout_toLeftOf="@id/widgets"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_alignWithParentIfMissing="true"
/> />
<TextView <TextView
android:id="@+id/from" android:id="@+id/from"

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

@ -95,9 +95,10 @@ public class MessageList extends K9ListActivity
private static final String STATE_KEY_SELECTION = "com.android.email.activity.messagelist_selection"; private static final String STATE_KEY_SELECTION = "com.android.email.activity.messagelist_selection";
private static final int WIDGET_FLAG = 1; private static final int WIDGET_NONE = 1;
private static final int WIDGET_DELETE = 2; private static final int WIDGET_FLAG = 2;
private static final int WIDGET_MULTISELECT = 3; private static final int WIDGET_DELETE = 3;
private static final int WIDGET_MULTISELECT = 4;
private static final int[] colorChipResIds = new int[] private static final int[] colorChipResIds = new int[]
{ {
@ -729,6 +730,10 @@ public class MessageList extends K9ListActivity
{ {
mSelectedWidget=WIDGET_MULTISELECT; mSelectedWidget=WIDGET_MULTISELECT;
} }
else if (mSelectedWidget == WIDGET_MULTISELECT)
{
mSelectedWidget=WIDGET_NONE;
}
else else
{ {
mSelectedWidget=WIDGET_FLAG; mSelectedWidget=WIDGET_FLAG;
@ -738,17 +743,21 @@ public class MessageList extends K9ListActivity
else else
{ {
if (mSelectedWidget == WIDGET_FLAG) if (mSelectedWidget == WIDGET_FLAG)
{
mSelectedWidget=WIDGET_NONE;
}
else if (mSelectedWidget == WIDGET_NONE)
{ {
mSelectedWidget=WIDGET_MULTISELECT; mSelectedWidget=WIDGET_MULTISELECT;
} }
else if (mSelectedWidget == WIDGET_DELETE) else if (mSelectedWidget == WIDGET_MULTISELECT)
{
mSelectedWidget=WIDGET_FLAG;
}
else
{ {
mSelectedWidget=WIDGET_DELETE; mSelectedWidget=WIDGET_DELETE;
} }
else // if (mSelectedWidget == WIDGET_DELETE)
{
mSelectedWidget=WIDGET_FLAG;
}
@ -773,6 +782,18 @@ public class MessageList extends K9ListActivity
return; return;
} }
if (nextWidget == WIDGET_NONE)
{
v.findViewById(R.id.widgets).setVisibility(View.GONE);
return;
}
else
{
v.findViewById(R.id.widgets).setVisibility(View.VISIBLE);
}
if (nextWidget == WIDGET_DELETE) if (nextWidget == WIDGET_DELETE)
{ {