diff options
| -rw-r--r-- | res/layout-sw600dp/message_compose.xml | 50 | ||||
| -rw-r--r-- | res/layout/quoted_text.xml | 62 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 5 |
4 files changed, 69 insertions, 50 deletions
diff --git a/res/layout-sw600dp/message_compose.xml b/res/layout-sw600dp/message_compose.xml index 78ddc742d..0a6dc6781 100644 --- a/res/layout-sw600dp/message_compose.xml +++ b/res/layout-sw600dp/message_compose.xml @@ -87,55 +87,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="100dip"> - <!-- quoted text bar --> - <LinearLayout - android:id="@+id/quoted_text_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - > - <LinearLayout - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="46dip" - > - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_weight="0" - android:layout_marginLeft="16dip" - android:gravity="left|center_vertical" - android:textSize="18dip" - android:textColor="@color/text_secondary_color" - android:text="@string/message_compose_quoted_text_label" - /> - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_weight="1" - android:gravity="right|center_vertical" - android:textSize="18dip" - android:textColor="@color/text_primary_color" - android:text="@string/message_compose_include_quoted_text_checkbox_label" - /> - <CheckBox - android:id="@+id/include_quoted_text" - android:layout_width="48dip" - android:layout_height="match_parent" - android:layout_weight="0" - android:gravity="center" - /> - </LinearLayout> - </LinearLayout> - <!-- - Quoted text - TODO: Don't put a webview in a scroll view. - --> - <WebView android:id="@+id/quoted_text" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:layout_marginTop="16dip" - android:layout_below="@id/quoted_text_bar"/> + <include layout="@layout/quoted_text"/> </RelativeLayout> <FrameLayout android:id="@+id/composearea_tap_trap_bottom" diff --git a/res/layout/quoted_text.xml b/res/layout/quoted_text.xml new file mode 100644 index 000000000..85b345589 --- /dev/null +++ b/res/layout/quoted_text.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/quoted_text_area" + android:layout_height="wrap_content" + android:layout_width="match_parent"> + + <RelativeLayout android:layout_width="match_parent" + android:layout_height="48dip" + android:id="@+id/quoted_text_bar"> + + <RelativeLayout android:layout_width="wrap_content" + android:layout_height="match_parent" + android:id="@+id/quoted_text_row" + android:layout_alignParentLeft="true"> + + <CheckBox android:id="@+id/include_quoted_text" + android:layout_height="match_parent" + android:layout_width="wrap_content" + android:layout_alignParentLeft="true" + android:gravity="center_vertical" + android:contentDescription="@string/message_compose_quoted_text_label"/> + + <TextView + android:text="@string/message_compose_quoted_text_label" + android:textAllCaps="true" + android:layout_height="match_parent" + android:layout_width="wrap_content" + android:layout_marginLeft="8dip" + style="@style/QuotedTextHeaderStyle" + android:layout_toRightOf="@+id/include_quoted_text" + android:gravity="center_vertical|left"/> + </RelativeLayout> + + </RelativeLayout> + + <View + android:layout_width="match_parent" + android:layout_height="2dip" + android:background="#babebe" + android:layout_below="@id/quoted_text_bar" + android:id="@+id/divider_bar" /> + + <WebView android:id="@+id/quoted_text" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_below="@id/divider_bar" /> + +</RelativeLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index c6dbf774f..2c9fbcf65 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -310,7 +310,7 @@ <!-- Header for replied-to messages --> <string name="message_compose_reply_header_fmt">\n\n<xliff:g id="sender">%s</xliff:g> wrote:\n\n</string> <!-- Heading that appears before forwarded text --> - <string name="message_compose_quoted_text_label">Quoted text</string> + <string name="message_compose_quoted_text_label">Include quoted text</string> <!-- Label of checkbox to include original message in a forwarded/replied message [CHAR_LIMIT=32] --> <string name="message_compose_include_quoted_text_checkbox_label">Include text</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 90debd4c9..6e3c51ee0 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -244,5 +244,10 @@ <item name="android:singleLine">true</item> <item name="android:ellipsize">end</item> </style> + + <style name="QuotedTextHeaderStyle"> + <item name="android:textColor">#777777</item> + <item name="android:textSize">12sp</item> + </style> </resources> |