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

fix height of compose view fields 

fixes bug:5223556 heights of compose view text fields are too tall on phone/ tablet

Change-Id: I1bbf570a66a424cffcabcae6cfdc2b6ca05be4b7
This commit is contained in:
Mindy Pereira 2011-08-26 18:27:04 -07:00
parent 1f1ead8d76
commit cc02d435b2
13 changed files with 219 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
res/layout-sw600dp-v14/address_text_view.xml → res/layout-sw600dp-v14/compose_subject.xml
View File

@ -13,11 +13,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.android.email.activity.ChipsAddressTextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:inputType="textEmailAddress|textMultiLine"
android:imeOptions="actionNext"
android:layout_height="wrap_content"
android:layout_width="match_parent"
style="@style/message_compose_header_field_value"/>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/RecipientComposeFieldLayout">
<TextView
android:id="@+id/subject_label"
style="@style/RecipientComposeHeading"
android:text="@string/message_compose_subject_label"
/>
<EditText
android:id="@+id/subject"
style="@style/ChipsComposeSubjectStyle"
android:inputType
="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine"
android:imeOptions="actionNext"
/>
</LinearLayout>

74
res/layout-sw600dp-v14/recipients_area.xml Normal file
View File

@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- We must have unique ID's for the address fields in order to have the text
automatically saved by framework.-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent">
<!-- to: -->
<LinearLayout
style="@style/RecipientComposeFieldLayout"
android:layout_alignParentTop="true"
android:id="@+id/to_content">
<TextView
android:id="@+id/label"
style="@style/RecipientComposeHeading"
android:text="@string/message_compose_to_label"
/>
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
android:id="@+id/to" />
</LinearLayout>
<LinearLayout
android:layout_below="@id/to_content"
android:id="@+id/cc_bcc_container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
>
<!-- cc: -->
<LinearLayout
style="@style/RecipientComposeFieldLayout"
android:id="@+id/cc_content"
>
<TextView
android:id="@+id/label"
style="@style/RecipientComposeHeading"
android:text="@string/message_compose_cc_label"
/>
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
android:id="@+id/cc" />
</LinearLayout>
<!-- bcc: -->
<LinearLayout
style="@style/RecipientComposeFieldLayout"
android:id="@+id/bcc_content"
>
<TextView
android:id="@+id/label"
style="@style/RecipientComposeHeading"
android:text="@string/message_compose_bcc_label"
/>
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
android:id="@+id/bcc" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

31
res/layout-sw600dp/compose_subject.xml Normal file
View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/message_compose_header_field_container"
>
<TextView
android:id="@+id/subject_label"
style="@style/message_compose_header_field_label"
android:text="@string/message_compose_subject_label"
/>
<EditText
android:id="@+id/subject"
style="@style/message_compose_header_field_value"
android:inputType
="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine"
android:imeOptions="actionNext"
/>
</LinearLayout>

65
res/layout-sw600dp/message_compose.xml
View File

@ -65,70 +65,9 @@
/>
</LinearLayout>
<!-- to: -->
<LinearLayout
style="@style/message_compose_header_field_container"
>
<TextView
android:id="@+id/to_label"
style="@style/message_compose_header_field_label"
android:text="@string/message_compose_to_label"
/>
<include android:id="@+id/to"
layout="@layout/address_text_view"/>
</LinearLayout>
<include layout="@layout/recipients_area"/>
<LinearLayout
android:id="@+id/cc_bcc_container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
>
<!-- cc: -->
<LinearLayout
style="@style/message_compose_header_field_container"
>
<TextView
android:id="@+id/cc_label"
style="@style/message_compose_header_field_label"
android:text="@string/message_compose_cc_label"
/>
<include android:id="@+id/cc"
layout="@layout/address_text_view"/>
</LinearLayout>
<!-- bcc: -->
<LinearLayout
style="@style/message_compose_header_field_container"
>
<TextView
android:id="@+id/bcc_label"
style="@style/message_compose_header_field_label"
android:text="@string/message_compose_bcc_label"
/>
<include android:id="@+id/bcc"
layout="@layout/address_text_view"/>
</LinearLayout>
</LinearLayout>
<!-- subject -->
<LinearLayout
style="@style/message_compose_header_field_container"
>
<TextView
android:id="@+id/subject_label"
style="@style/message_compose_header_field_label"
android:text="@string/message_compose_subject_label"
/>
<EditText
android:id="@+id/subject"
style="@style/message_compose_header_field_value"
android:inputType
="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine"
android:imeOptions="actionNext"
/>
</LinearLayout>
<include layout="@layout/compose_subject"/>
</LinearLayout> <!-- end of header -->
<!-- Buttons: +cc/bcc, add attachment -->

79
res/layout-sw600dp/recipients_area.xml Normal file
View File

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- We must have unique ID's for the address fields in order to have the text
automatically saved by framework.-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent">
<!-- to: -->
<LinearLayout
style="@style/message_compose_header_field_container"
android:layout_alignParentTop="true"
android:id="@+id/to_content"
>
<TextView
android:id="@+id/to_label"
style="@style/message_compose_header_field_label"
android:text="@string/message_compose_to_label"
/>
<com.android.email.activity.AddressTextView
android:id="@+id/to"
android:inputType="textEmailAddress|textMultiLine"
android:imeOptions="actionNext"
style="@style/message_compose_header_field_value"/>
</LinearLayout>
<LinearLayout
android:id="@+id/cc_bcc_container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_below="@id/to_content"
>
<!-- cc: -->
<LinearLayout
style="@style/message_compose_header_field_container"
>
<TextView
android:id="@+id/cc_label"
style="@style/message_compose_header_field_label"
android:text="@string/message_compose_cc_label"
/>
<com.android.email.activity.AddressTextView
android:id="@+id/cc"
android:inputType="textEmailAddress|textMultiLine"
android:imeOptions="actionNext"
style="@style/message_compose_header_field_value"/>
</LinearLayout>
<!-- bcc: -->
<LinearLayout
style="@style/message_compose_header_field_container"
>
<TextView
android:id="@+id/bcc_label"
style="@style/message_compose_header_field_label"
android:text="@string/message_compose_bcc_label"
/>
<com.android.email.activity.AddressTextView
android:id="@+id/bcc"
android:inputType="textEmailAddress|textMultiLine"
android:imeOptions="actionNext"
style="@style/message_compose_header_field_value"/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

7
res/layout-v14/compose_from.xml
View File

@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/RecipientComposeFieldLayout">
<TextView
android:id="@+id/from"
@ -21,8 +21,5 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:background="@null"
android:paddingLeft="8dip"
android:paddingBottom="16dip"
android:paddingTop="16dip"
/>
</RelativeLayout>
</LinearLayout>

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

@ -13,9 +13,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/RecipientComposeFieldLayout">
<EditText android:id="@+id/subject"
style="@style/ChipsComposeSubjectStyle"
android:hint="@string/message_compose_subject_hint"
/>
</RelativeLayout>
</LinearLayout>

4
res/layout-v14/message_compose_body.xml
View File

@ -13,11 +13,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/RecipientComposeFieldLayout">
<EditText android:id="@+id/message_content"
style="@style/ChipsComposeBodyStyle"
/>
</RelativeLayout>
</LinearLayout>

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

@ -19,7 +19,7 @@ automatically saved by framework.-->
android:layout_height="wrap_content"
android:layout_width="match_parent">
<RelativeLayout
<LinearLayout
style="@style/RecipientComposeFieldLayout"
android:layout_alignParentTop="true"
android:layout_height="wrap_content"
@ -32,10 +32,9 @@ automatically saved by framework.-->
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
android:layout_toRightOf="@id/label"
android:id="@+id/to" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_below="@id/to_content"
android:id="@+id/cc_bcc_container"
@ -44,7 +43,7 @@ automatically saved by framework.-->
android:orientation="vertical"
android:visibility="gone">
<RelativeLayout
<LinearLayout
style="@style/RecipientComposeFieldLayout"
android:layout_alignParentTop="true"
android:id="@+id/cc_content">
@ -55,12 +54,11 @@ automatically saved by framework.-->
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
android:layout_toRightOf="@id/label"
android:id="@+id/cc" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
<LinearLayout
style="@style/RecipientComposeFieldLayout"
android:layout_alignParentTop="true"
android:id="@+id/bcc_content">
@ -71,10 +69,9 @@ automatically saved by framework.-->
<com.android.email.activity.ChipsAddressTextView
style="@style/EmailRecipientEditTextView"
android:layout_toRightOf="@id/label"
android:id="@+id/bcc" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

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

@ -40,10 +40,6 @@
<item name="android:layout_marginTop">-2dip</item>
</style>
<style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
<item name="android:minHeight">40dip</item>
</style>
<style name="message_view_action_buttons" parent="android:Widget.Holo.Button.Borderless">
<item name="android:layout_width">32dip</item>
<item name="android:layout_height">24dip</item>

3
res/values-sw600dp-land/styles.xml
View File

@ -21,7 +21,4 @@
<style name="message_compose_scroll">
<item name="android:layout_width">800dip</item>
</style>
<style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
<item name="android:minHeight">48dip</item>
</style>
</resources>

7
res/values-v13/styles.xml
View File

@ -19,19 +19,14 @@
<style name="EmailTheme" parent="@android:style/Theme.Holo.Light">
</style>
<style name="EmailRecipientEditTextView" parent="@style/RecipientEditTextView">
<item name="android:layout_marginBottom">2dip</item>
<item name="android:layout_marginTop">2dip</item>
<item name="android:minHeight">0dip</item>
</style>
<style name="ChipsComposeBodyStyle" parent="@style/ComposeBodyStyle">
<item name="android:minHeight">0dip</item>
<item name="android:background">@null</item>
<item name="android:paddingBottom">12dip</item>
<item name="android:paddingTop">8dip</item>
</style>
<style name="ChipsComposeSubjectStyle" parent="@style/ComposeSubjectStyle">
<item name="android:minHeight">0dip</item>
<item name="android:background">@null</item>
<item name="android:paddingBottom">12dip</item>
<item name="android:paddingTop">8dip</item>
</style>
</resources>

15
res/values/styles.xml
View File

@ -235,11 +235,10 @@
<style name="RecipientComposeHeading">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">48dip</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item>
<item name="android:paddingLeft">8dip</item>
<item name="android:gravity">center_vertical</item>
<item name="android:textColor">@color/compose_label_text</item>
<item name="android:layout_marginRight">4dip</item>
</style>
<style name="RecipientComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
@ -248,14 +247,11 @@
<item name="android:addStatesFromChildren">true</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
<item name="android:paddingLeft">0dip</item>
<item name="android:paddingRight">0dip</item>
<item name="android:paddingTop">0dip</item>
<item name="android:paddingBottom">8dip</item>
<item name="android:gravity">bottom</item>
<item name="android:minHeight">48dip</item>
</style>
<style name="ComposeBodyStyle">
<item name="android:paddingTop">0dip</item>
<item name="android:minHeight">48dip</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
@ -263,7 +259,6 @@
<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:paddingLeft">8dip</item>
<item name="android:textColorHint">@color/compose_label_text</item>
</style>
@ -273,10 +268,8 @@
<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:hint">@string/message_compose_subject_hint</item>
<item name="android:inputType">textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine</item>
<item name="android:imeOptions">actionNext|flagNoExtractUi</item>
<item name="android:paddingLeft">8dip</item>
</style>
<style name="message_list_item_normal">