Fixup quoted text styling.
Fixes for b/5517524 compose on tablets needs redlines Change-Id: I8a7fab7ad635deee9ddb23f59ea2caf0848f496d
This commit is contained in:
Mindy Pereira
parent
1b6e1ae306
commit
4cd64ad4d5
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue