ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Low-cost minimal fixes to make phone UI usable 

This is a stopgap fix prior to getting designs in to at least make the
various message view components visible on screen so people can at least
use the app.

Note that this also removes reply all/forward, as per the design (the
idea is you can switch in the compose view, so we don't want to waste
real estate in the message view).

Bug: 4644072
Change-Id: I86f041678373a0fbc79a2e135a47cd1e5b1357c7
This commit is contained in:
Ben Komalo 2011-06-14 18:06:24 -07:00
parent 871d031e4f
commit e4ca576ab0
2 changed files with 47 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
res/layout/message_view_fragment.xml
View File

@ -51,10 +51,10 @@
>
<ImageView
android:id="@+id/badge"
android:layout_width="48dip"
android:layout_height="48dip"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_gravity="center_vertical"
android:layout_marginRight="8dip"
android:layout_marginRight="2dip"
android:layout_marginLeft="2dip"
/>
<ImageView
@ -62,35 +62,34 @@
android:src="@android:drawable/presence_offline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dip"
android:layout_marginRight="2dip"
android:layout_gravity="center_vertical"
/>
<TextView
android:id="@+id/from_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_alignParentLeft="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:textColor="?android:attr/textColorPrimary"
android:singleLine="true"
android:ellipsize="end"
android:paddingRight="6dip"
/>
<TextView
android:id="@+id/from_address"
<RelativeLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_alignParentLeft="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="normal"
android:textColor="?android:attr/textColorPrimary"
android:singleLine="true"
android:ellipsize="end"
android:paddingRight="6dip"
/>
>
<TextView
android:id="@+id/from_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="end"
/>
<TextView
android:id="@+id/from_address"
android:layout_below="@+id/from_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:singleLine="true"
android:ellipsize="end"
/>
</RelativeLayout>
<!-- Reply/Forward buttons are default gone for MessageFileView -->
<ImageView
android:id="@+id/reply"
@ -102,31 +101,11 @@
android:visibility="gone"
/>
<ImageView
android:id="@+id/reply_all"
android:src="@drawable/reply_all"
android:id="@+id/favorite"
android:layout_width="32dip"
android:layout_height="24dip"
android:layout_margin="6dip"
android:baselineAlignBottom="true"
android:visibility="gone"
/>
<ImageView
android:id="@+id/forward"
android:src="@drawable/forward"
android:layout_width="32dip"
android:layout_height="24dip"
android:layout_margin="6dip"
android:baselineAlignBottom="true"
android:visibility="gone"
/>
<TextView
android:id="@+id/datetime"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dip"
android:singleLine="true"
android:src="@drawable/btn_star_off_normal_email_holo_light"
/>
</LinearLayout>
@ -154,15 +133,15 @@
android:singleLine="true"
android:ellipsize="end"
/>
<!-- TODO: Move this to wherever it really belongs -->
<ImageView
android:id="@+id/favorite"
<TextView
android:id="@+id/datetime"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:src="@drawable/btn_star_off_normal_email_holo_light"
android:layout_marginLeft="4dip"
android:singleLine="true"
/>
<!-- TODO Just to prevent NPE - Phone UI is TBD -->
<Button
android:id="@+id/show_details"
android:layout_width="wrap_content"

20
src/com/android/email/activity/MessageViewFragment.java
View File

@ -54,7 +54,11 @@ public class MessageViewFragment extends MessageViewFragmentBase
private ImageView mFavoriteIcon;
private View mReplyButton;
/* Nullable - not available on phone. */
private View mReplyAllButton;
/* Nullable - not available on phone. */
private View mForwardButton;
// calendar meeting invite answers
@ -218,8 +222,8 @@ public class MessageViewFragment extends MessageViewFragmentBase
mFavoriteIcon = (ImageView) UiUtilities.getView(view, R.id.favorite);
mReplyButton = UiUtilities.getView(view, R.id.reply);
mReplyAllButton = UiUtilities.getView(view, R.id.reply_all);
mForwardButton = UiUtilities.getView(view, R.id.forward);
mReplyAllButton = UiUtilities.getViewOrNull(view, R.id.reply_all);
mForwardButton = UiUtilities.getViewOrNull(view, R.id.forward);
mMeetingYes = (CheckBox) UiUtilities.getView(view, R.id.accept);
mMeetingMaybe = (CheckBox) UiUtilities.getView(view, R.id.maybe);
mMeetingNo = (CheckBox) UiUtilities.getView(view, R.id.decline);
@ -229,8 +233,10 @@ public class MessageViewFragment extends MessageViewFragmentBase
mFavoriteIcon.setOnClickListener(this);
mReplyButton.setOnClickListener(this);
mReplyAllButton.setOnClickListener(this);
mForwardButton.setOnClickListener(this);
if (mReplyAllButton != null) {
mReplyAllButton.setOnClickListener(this);
mForwardButton.setOnClickListener(this);
}
mMeetingYes.setOnCheckedChangeListener(this);
mMeetingMaybe.setOnCheckedChangeListener(this);
mMeetingNo.setOnCheckedChangeListener(this);
@ -250,8 +256,10 @@ public class MessageViewFragment extends MessageViewFragmentBase
// We don't have disabled button assets, so let's hide them for now
final int visibility = enabled ? View.VISIBLE : View.GONE;
mReplyButton.setVisibility(visibility);
mReplyAllButton.setVisibility(visibility);
mForwardButton.setVisibility(visibility);
if (mReplyAllButton != null) {
mReplyAllButton.setVisibility(visibility);
mForwardButton.setVisibility(visibility);
}
}
public void setCallback(Callback callback) {