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

Merge "Change "id" to "android:id""

Browse Source
This commit is contained in:
Makoto Onuki 2010-11-23 11:44:18 -08:00 committed by Android (Google) Code Review
commit 0d6eea970d
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
res/layout-xlarge/message_compose.xml
View File

@ -153,56 +153,57 @@
/>
<!-- quoted text bar -->
<RelativeLayout
<LinearLayout
android:id="@+id/quoted_text_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="4dip"
android:paddingBottom="4dip"
>
<View
id="@+id/topDivider"
android:layout_width="match_parent"
android:layout_alignParentTop="true"
style="@style/message_compose_divider"
style="@style/horizontalDivider"
/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_gravity="left|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondaryInverse"
android:text="@string/message_compose_quoted_text_label"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="right|center_vertical"
android:gravity="right|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondaryInverse"
android:text="@string/message_compose_include_quoted_text_checkbox_label"
/>
<CheckBox
android:id="@+id/include_quoted_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_gravity="center"
/>
</LinearLayout>
<View
id="@+id/bottomDivider"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
style="@style/message_compose_divider"
style="@style/horizontalDivider"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/topDivider"
android:layout_above="@id/bottomDivider"
android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondaryInverse"
android:text="@string/message_compose_quoted_text_label"
/>
<CheckBox
android:id="@+id/include_quoted_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/topDivider"
android:layout_above="@id/bottomDivider"
android:layout_centerVertical="true"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/include_quoted_text"
android:layout_below="@id/topDivider"
android:layout_above="@id/bottomDivider"
android:layout_centerVertical="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondaryInverse"
android:text="@string/message_compose_include_quoted_text_checkbox_label"
/>
</RelativeLayout>
</LinearLayout>
<!--
Quoted text
TODO: Don't put a webview in a scroll view.

4
res/values-xlarge/styles.xml
View File

@ -78,8 +78,4 @@
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="message_compose_divider" parent="horizontalDivider">
<item name="android:layout_width">match_parent</item>
</style>
</resources>