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

Merge "Fix UI issue with expanding details."

Browse Source
This commit is contained in:
Ben Komalo 2011-07-15 15:15:26 -07:00 committed by Android (Google) Code Review
commit ffe1b29061
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
res/layout/message_view_details.xml
View File

@ -31,27 +31,16 @@
android:text="@string/message_view_date_label" android:text="@string/message_view_date_label"
style="@style/message_details_label" style="@style/message_details_label"
/> />
<RelativeLayout
android:layout_width="wrap_content" <!-- Put in some margin on the right to accomodate for the "hide
details" icon -->
<TextView
android:id="@+id/date"
style="@style/message_details_value"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
> android:layout_marginRight="32dip"
<ImageView />
android:id="@+id/show_details"
android:src="@drawable/ic_menu_expander_maximized_holo_light"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
/>
<TextView
android:id="@+id/date"
android:layout_toLeftOf="@+id/show_details"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/message_details_value"
/>
</RelativeLayout>
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/to_row" android:id="@+id/to_row"

26
res/layout/message_view_subheader.xml
View File

@ -51,17 +51,35 @@
android:id="@+id/show_details" android:id="@+id/show_details"
android:src="@drawable/ic_menu_expander_minimized_holo_light" android:src="@drawable/ic_menu_expander_minimized_holo_light"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="48dip"
android:layout_marginLeft="4dip" android:layout_marginLeft="4dip"
android:gravity="center" android:scaleType="center"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
/> />
</LinearLayout> </LinearLayout>
<!-- Expanded version --> <!-- Expanded version -->
<include layout="@layout/message_view_details" <FrameLayout
android:id="@+id/sub_header_contents_expanded" android:id="@+id/sub_header_contents_expanded"
android:visibility="gone" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
>
<include layout="@layout/message_view_details" />
<!-- Overlay the collapse details icon.
The height here needs to match the height of the collapsed subheader -->
<ImageView
android:id="@+id/show_details"
android:src="@drawable/ic_menu_expander_maximized_holo_light"
android:layout_width="wrap_content"
android:layout_height="48dip"
android:layout_marginLeft="4dip"
android:scaleType="center"
android:layout_gravity="right"
/>
</FrameLayout>
</merge> </merge>