diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:53:28 -0800 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 13:53:28 -0800 |
commit | cf5fa82efe292ac25505b5a7a91ef3b3ba4f9b4b (patch) | |
tree | 62dd45b3e060c0223b6c6d8c46eefce36717a81b | |
parent | 25137032416999e55729bcbf34acff7896c1edda (diff) | |
parent | 8b13439c20dcda483eda2f022061c9fec84b3295 (diff) | |
download | android_packages_apps_UnifiedEmail-cf5fa82efe292ac25505b5a7a91ef3b3ba4f9b4b.tar.gz android_packages_apps_UnifiedEmail-cf5fa82efe292ac25505b5a7a91ef3b3ba4f9b4b.tar.bz2 android_packages_apps_UnifiedEmail-cf5fa82efe292ac25505b5a7a91ef3b3ba4f9b4b.zip |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9ccstable/cm-11.0-XNF8Yshipping/cm-11.0
-rw-r--r-- | res/layout/conversation_message_details_header_expanded.xml | 270 |
1 files changed, 137 insertions, 133 deletions
diff --git a/res/layout/conversation_message_details_header_expanded.xml b/res/layout/conversation_message_details_header_expanded.xml index 94bc9dcc3..67deb536e 100644 --- a/res/layout/conversation_message_details_header_expanded.xml +++ b/res/layout/conversation_message_details_header_expanded.xml @@ -15,138 +15,142 @@ See the License for the specific language governing permissions and limitations under the License. --> -<android.support.v7.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/details_expanded_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?android:attr/selectableItemBackground" - app:columnCount="3" - app:rowCount="6" - style="@style/MessageDetailsHeaderStyle" > +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + <android.support.v7.widget.GridLayout + android:id="@+id/details_expanded_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?android:attr/selectableItemBackground" + app:columnCount="3" + app:rowCount="6" + style="@style/MessageDetailsHeaderStyle" > - <TextView - android:id="@+id/from_heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_column="0" - app:layout_row="0" - android:text="@string/from_heading" - android:visibility="gone" - style="@style/MessageHeaderDetailsHeadingStyle" /> - <TextView - android:id="@+id/from_details" - android:layout_width="0dp" - android:layout_height="wrap_content" - app:layout_gravity="fill_horizontal" - android:layout_marginBottom="4dp" - app:layout_column="1" - app:layout_row="0" - android:visibility="gone" - style="@style/MessageDetailsValueStyle" /> - <ImageView - android:id="@+id/details_expander" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_column="2" - app:layout_row="0" - android:contentDescription="@string/collapse_recipient_details" - android:src="@drawable/ic_menu_expander_maximized_holo_light" - style="@style/DetailsExpanderStyle" /> - <TextView - android:id="@+id/replyto_heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_column="0" - app:layout_row="1" - android:text="@string/replyto_heading" - android:visibility="gone" - style="@style/MessageHeaderDetailsHeadingStyle" /> - <TextView - android:id="@+id/replyto_details" - android:layout_width="0dp" - android:layout_height="wrap_content" - app:layout_gravity="fill_horizontal" - android:layout_marginBottom="4dp" - app:layout_column="1" - app:layout_row="1" - android:visibility="gone" - style="@style/MessageDetailsValueStyle" /> - <TextView - android:id="@+id/to_heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_column="0" - app:layout_row="2" - android:text="@string/to_heading" - android:visibility="gone" - style="@style/MessageHeaderDetailsHeadingStyle" /> - <TextView - android:id="@+id/to_details" - android:layout_width="0dp" - android:layout_height="wrap_content" - app:layout_gravity="fill_horizontal" - android:layout_marginBottom="4dp" - app:layout_column="1" - app:layout_row="2" - android:visibility="gone" - style="@style/MessageDetailsValueStyle" /> - <TextView - android:id="@+id/cc_heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_column="0" - app:layout_row="3" - android:text="@string/cc_heading" - android:visibility="gone" - style="@style/MessageHeaderDetailsHeadingStyle" /> - <TextView - android:id="@+id/cc_details" - android:layout_width="0dp" - android:layout_height="wrap_content" - app:layout_gravity="fill_horizontal" - android:layout_marginBottom="4dp" - app:layout_column="1" - app:layout_row="3" - android:visibility="gone" - style="@style/MessageDetailsValueStyle" /> - <TextView - android:id="@+id/bcc_heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_column="0" - app:layout_row="4" - android:text="@string/bcc_heading" - android:visibility="gone" - style="@style/MessageHeaderDetailsHeadingStyle" /> - <TextView - android:id="@+id/bcc_details" - android:layout_width="0dp" - android:layout_height="wrap_content" - app:layout_gravity="fill_horizontal" - android:layout_marginBottom="4dp" - app:layout_column="1" - app:layout_row="4" - android:visibility="gone" - style="@style/MessageDetailsValueStyle" /> - <TextView - android:id="@+id/date_heading" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:layout_column="0" - app:layout_row="5" - android:text="@string/date_heading" - android:visibility="gone" - style="@style/MessageHeaderDetailsHeadingStyle" /> - <TextView - android:id="@+id/date_details" - android:layout_width="0dp" - android:layout_height="wrap_content" - app:layout_gravity="fill_horizontal" - android:layout_marginBottom="4dp" - app:layout_column="1" - app:layout_row="5" - android:visibility="gone" - style="@style/MessageDetailsValueStyle" /> + <TextView + android:id="@+id/from_heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_column="0" + app:layout_row="0" + android:text="@string/from_heading" + android:visibility="gone" + style="@style/MessageHeaderDetailsHeadingStyle" /> + <TextView + android:id="@+id/from_details" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_gravity="fill_horizontal" + android:layout_marginBottom="4dp" + app:layout_column="1" + app:layout_row="0" + android:visibility="gone" + style="@style/MessageDetailsValueStyle" /> + <ImageView + android:id="@+id/details_expander" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_column="2" + app:layout_row="0" + android:contentDescription="@string/collapse_recipient_details" + android:src="@drawable/ic_menu_expander_maximized_holo_light" + style="@style/DetailsExpanderStyle" /> + <TextView + android:id="@+id/replyto_heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_column="0" + app:layout_row="1" + android:text="@string/replyto_heading" + android:visibility="gone" + style="@style/MessageHeaderDetailsHeadingStyle" /> + <TextView + android:id="@+id/replyto_details" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_gravity="fill_horizontal" + android:layout_marginBottom="4dp" + app:layout_column="1" + app:layout_row="1" + android:visibility="gone" + style="@style/MessageDetailsValueStyle" /> + <TextView + android:id="@+id/to_heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_column="0" + app:layout_row="2" + android:text="@string/to_heading" + android:visibility="gone" + style="@style/MessageHeaderDetailsHeadingStyle" /> + <TextView + android:id="@+id/to_details" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_gravity="fill_horizontal" + android:layout_marginBottom="4dp" + app:layout_column="1" + app:layout_row="2" + android:visibility="gone" + style="@style/MessageDetailsValueStyle" /> + <TextView + android:id="@+id/cc_heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_column="0" + app:layout_row="3" + android:text="@string/cc_heading" + android:visibility="gone" + style="@style/MessageHeaderDetailsHeadingStyle" /> + <TextView + android:id="@+id/cc_details" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_gravity="fill_horizontal" + android:layout_marginBottom="4dp" + app:layout_column="1" + app:layout_row="3" + android:visibility="gone" + style="@style/MessageDetailsValueStyle" /> + <TextView + android:id="@+id/bcc_heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_column="0" + app:layout_row="4" + android:text="@string/bcc_heading" + android:visibility="gone" + style="@style/MessageHeaderDetailsHeadingStyle" /> + <TextView + android:id="@+id/bcc_details" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_gravity="fill_horizontal" + android:layout_marginBottom="4dp" + app:layout_column="1" + app:layout_row="4" + android:visibility="gone" + style="@style/MessageDetailsValueStyle" /> + <TextView + android:id="@+id/date_heading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_column="0" + app:layout_row="5" + android:text="@string/date_heading" + android:visibility="gone" + style="@style/MessageHeaderDetailsHeadingStyle" /> + <TextView + android:id="@+id/date_details" + android:layout_width="0dp" + android:layout_height="wrap_content" + app:layout_gravity="fill_horizontal" + android:layout_marginBottom="4dp" + app:layout_column="1" + app:layout_row="5" + android:visibility="gone" + style="@style/MessageDetailsValueStyle" /> -</android.support.v7.widget.GridLayout> + </android.support.v7.widget.GridLayout> +</ScrollView>
\ No newline at end of file |