Show subject in conversation view in portrait mode.
Change-Id: Ib1918510949ea9498ca68a0718ffb96dc07648b7
diff --git a/res/layout/quoted_text.xml b/res/layout/quoted_text.xml
index 9638641..aab3f3a 100644
--- a/res/layout/quoted_text.xml
+++ b/res/layout/quoted_text.xml
@@ -37,6 +37,7 @@
android:contentDescription="@string/quoted_text"/>
<TextView
+ android:id="@+id/hide_quoted_text_label"
android:text="@string/quoted_text_label"
android:textAllCaps="true"
android:layout_height="match_parent"
@@ -45,7 +46,8 @@
style="@style/QuotedTextHeaderStyle"
android:layout_toRightOf="@+id/hide_quoted_text"
android:gravity="center_vertical|left"
- android:ellipsize="end"/>
+ android:ellipsize="end"
+ android:clickable="true" />
</RelativeLayout>
<View android:layout_height="match_parent"
diff --git a/res/values-sw600dp-port/constants.xml b/res/values-sw600dp-port/constants.xml
index 3168d69..6336ae6 100644
--- a/res/values-sw600dp-port/constants.xml
+++ b/res/values-sw600dp-port/constants.xml
@@ -29,4 +29,7 @@
<!-- Whether to show single or 2 pane search results -->
<bool name="show_two_pane_search_results">false</bool>
+
+ <!-- Whether to show conversation subject in conversation view -->
+ <bool name="show_conversation_subject">true</bool>
</resources>
\ No newline at end of file
diff --git a/res/values-sw600dp/constants.xml b/res/values-sw600dp/constants.xml
index 4efbc24..e88dabf 100644
--- a/res/values-sw600dp/constants.xml
+++ b/res/values-sw600dp/constants.xml
@@ -29,4 +29,7 @@
<!-- Whether to show single or 2 pane search results -->
<bool name="show_two_pane_search_results">true</bool>
+
+ <!-- Whether to show conversation subject in conversation view -->
+ <bool name="show_conversation_subject">false</bool>
</resources>
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 5fe6e58..d26abae 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -57,4 +57,7 @@
<!-- Whether to show single or 2 pane search results -->
<bool name="show_two_pane_search_results">false</bool>
+
+ <!-- Whether to show conversation subject in conversation view -->
+ <bool name="show_conversation_subject">true</bool>
</resources>
diff --git a/src/com/android/mail/ui/ActionBarView.java b/src/com/android/mail/ui/ActionBarView.java
index 8a6bc6f..623a2c7 100644
--- a/src/com/android/mail/ui/ActionBarView.java
+++ b/src/com/android/mail/ui/ActionBarView.java
@@ -100,6 +100,7 @@
* method talks about why this is required.
*/
private boolean mIgnoreFirstNavigation = true;
+ private Boolean mShowConversationSubject;
public ActionBarView(Context context) {
this(context, null);
@@ -396,7 +397,8 @@
mActionBar.setDisplayHomeAsUpEnabled(true);
// FIXME: use a resource to have fine-grained control over whether the spinner
// or the subject appears
- if (Utils.useTabletUI(mActivity.getActivityContext())) {
+ if (Utils.useTabletUI(mActivity.getActivityContext())
+ && !showConversationSubject()) {
showNavList();
} else {
setStandardMode();
@@ -430,6 +432,14 @@
return false;
}
+ private boolean showConversationSubject() {
+ if (mShowConversationSubject == null) {
+ mShowConversationSubject = new Boolean(mActivity.getActivityContext().getResources()
+ .getBoolean(R.bool.show_conversation_subject));
+ }
+ return mShowConversationSubject;
+ }
+
/**
* Put the ActionBar in List navigation mode. This starts the spinner up if it is missing.
*/