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

Use styles in the mailcommon directory for the compose view. 

Change-Id: Ib14f99355a78bb00aa06c87ae6329940f5d66444
This commit is contained in:
Mindy Pereira 2011-10-11 10:51:56 -07:00
parent 2949d48f1d
commit f5ac3c6901
9 changed files with 17 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@ -20,7 +20,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
# Include res dir from chips
chips_dir := ../../../frameworks/ex/chips/res
res_dir := $(chips_dir) res
mail_common_dir := ../../../frameworks/opt/mailcommon/res
res_dir := $(chips_dir) $(mail_common_dir) res
LOCAL_MODULE_TAGS := optional

2
res/layout-sw600dp-v14/compose_subject.xml
View File

@ -22,7 +22,7 @@
/>
<EditText
android:id="@+id/subject"
style="@style/EmailComposeEditTextView"
style="@style/ComposeEditTextView"
android:inputType
="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine"
android:imeOptions="actionNext"

6
res/layout-sw600dp-v14/recipients_area.xml
View File

@ -29,7 +29,7 @@ automatically saved by framework.-->
android:text="@string/message_compose_to_label"
/>
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
style="@style/RecipientEditTextViewStyle"
android:id="@+id/to" />
</LinearLayout>
@ -52,7 +52,7 @@ automatically saved by framework.-->
android:text="@string/message_compose_cc_label"
/>
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
style="@style/RecipientEditTextViewStyle"
android:id="@+id/cc" />
</LinearLayout>
@ -67,7 +67,7 @@ automatically saved by framework.-->
android:text="@string/message_compose_bcc_label"
/>
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
style="@style/RecipientEditTextViewStyle"
android:id="@+id/bcc" />
</LinearLayout>
</LinearLayout>

2
res/layout-v14/compose_subject.xml
View File

@ -17,7 +17,7 @@
style="@style/ComposeFieldLayout">
<!-- TODO: consolidate this style with ComposeSubjectStyle -->
<EditText android:id="@+id/subject"
style="@style/EmailComposeEditTextView"
style="@style/ComposeEditTextView"
android:hint="@string/message_compose_subject_hint"
android:inputType="textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine"
android:textColorHint="@color/compose_label_text"

6
res/layout-v14/recipients_area.xml
View File

@ -36,7 +36,7 @@ automatically saved by framework.-->
android:id="@+id/label"/>
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
style="@style/RecipientEditTextViewStyle"
android:id="@+id/to" />
</LinearLayout>
@ -65,7 +65,7 @@ automatically saved by framework.-->
android:id="@+id/label"/>
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
style="@style/RecipientEditTextViewStyle"
android:id="@+id/cc" />
</LinearLayout>
@ -86,7 +86,7 @@ automatically saved by framework.-->
android:id="@+id/label"/>
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
style="@style/RecipientEditTextViewStyle"
android:id="@+id/bcc" />
</LinearLayout>

6
res/layout/recipients_area.xml
View File

@ -22,7 +22,7 @@ automatically saved by framework.-->
android:layout_marginRight="6dip">
<RelativeLayout
style="@style/ComposeFieldLinearLayout"
style="@style/ComposeFieldLayout"
android:layout_alignParentTop="true"
android:layout_height="wrap_content"
android:layout_width="match_parent"
@ -50,7 +50,7 @@ automatically saved by framework.-->
android:visibility="gone">
<RelativeLayout
style="@style/ComposeFieldLinearLayout"
style="@style/ComposeFieldLayout"
android:layout_alignParentTop="true"
android:id="@+id/cc_content">
@ -69,7 +69,7 @@ automatically saved by framework.-->
</RelativeLayout>
<RelativeLayout
style="@style/ComposeFieldLinearLayout"
style="@style/ComposeFieldLayout"
android:layout_alignParentTop="true"
android:id="@+id/bcc_content">

4
res/values-land-v14/styles.xml
View File

@ -35,7 +35,7 @@
<item name="android:paddingTop">0dip</item>
</style>
<style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
<style name="RecipientEditTextViewStyle" parent="@style/RecipientEditTextView">
<item name="android:minHeight">36dip</item>
<item name="android:gravity">bottom</item>
</style>
@ -46,7 +46,7 @@
<item name="android:minHeight">38dip</item>
</style>
<style name="EmailComposeEditTextView">
<style name="ComposeEditTextView">
<item name="android:minHeight">40dip</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_height">wrap_content</item>

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

@ -195,12 +195,12 @@
<style name="RecipientComposeFieldLayout" parent="@style/ComposeFieldRelLayout">
</style>
<style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
<style name="RecipientEditTextViewStyle" parent="@style/RecipientEditTextView">
<item name="android:minHeight">0dip</item>
<item name="android:gravity">center_vertical</item>
</style>
<style name="EmailComposeEditTextView">
<style name="ComposeEditTextView">
<item name="android:minHeight">0dip</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_height">wrap_content</item>

89
res/values/styles.xml
View File

@ -215,95 +215,6 @@
<item name="android:paddingRight">6dip</item>
</style>
<style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
<item name="android:minHeight">42dip</item>
<item name="android:gravity">bottom</item>
</style>
<style name="EmailComposeEditTextView">
<item name="android:minHeight">44dip</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:background">@null</item>
</style>
<style name="LargeComposeAreaBody" parent="@style/ComposeBodyStyle" >
<item name="android:background">@null</item>
<item name="android:minHeight">42dip</item>
<item name="android:layout_gravity">center_vertical</item>
</style>
<style name="RecipientComposeFieldSpacer">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">4dip</item>
</style>
<style name="ComposeFieldLinearLayout" parent="android:Widget.Holo.Light.EditText">
<item name="android:addStatesFromChildren">true</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
<item name="android:orientation">horizontal</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:clickable">true</item>
<item name="android:paddingLeft">0dip</item>
<item name="android:paddingRight">0dip</item>
</style>
<style name="ComposeHeading">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item>
<item name="android:textColor">@color/compose_label_text</item>
<item name="android:paddingLeft">8dip</item>
<item name="android:layout_gravity">center_vertical</item>
</style>
<style name="RecipientComposeHeading">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item>
<item name="android:textColor">@color/compose_label_text</item>
<item name="android:layout_marginRight">4dip</item>
<item name="android:layout_marginTop">4dip</item>
<item name="android:layout_gravity">center_vertical</item>
</style>
<style name="ComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:addStatesFromChildren">true</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
<item name="android:gravity">center_vertical</item>
<item name="android:paddingTop">0dip</item>
</style>
<style name="RecipientComposeFieldLayout" parent="@style/ComposeFieldLayout">
<item name="android:orientation">vertical</item>
</style>
<style name="ComposeBodyStyle">
<item name="android:minHeight">48dip</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:gravity">center_vertical</item>
<item name="android:inputType">textLongMessage|textMultiLine|textAutoCorrect|textCapSentences</item>
<item name="android:hint">@string/message_compose_body_hint</item>
<item name="android:imeOptions">flagNoExtractUi|actionDone|flagNoEnterAction</item>
<item name="android:textColorHint">@color/compose_label_text</item>
</style>
<style name="ComposeSubjectStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textColorHint">@color/compose_label_text</item>
<item name="android:inputType">textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine</item>
<item name="android:imeOptions">actionNext|flagNoExtractUi</item>
</style>
<style name="message_list_item_normal">
<!-- no styles on phones -->
</style>