diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-08-31 16:17:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-31 16:17:04 +0000 |
| commit | c39ea3c55fac807c0b98aabdf56c70dc8a49036c (patch) | |
| tree | e282668a9587cf6c1ec7b604dea860400c75c6c7 /java/com/android/dialer/widget/res/layout/fragment_message.xml | |
| parent | 68038172793ee0e2ab3e2e56ddfbeb82879d1f58 (diff) | |
| parent | 2ca4318cc1ee57dda907ba2069bd61d162b1baef (diff) | |
Merge "Update Dialer source to latest internal Google revision."
Diffstat (limited to 'java/com/android/dialer/widget/res/layout/fragment_message.xml')
| -rw-r--r-- | java/com/android/dialer/widget/res/layout/fragment_message.xml | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/java/com/android/dialer/widget/res/layout/fragment_message.xml b/java/com/android/dialer/widget/res/layout/fragment_message.xml index e39e03aee..bdb85fa81 100644 --- a/java/com/android/dialer/widget/res/layout/fragment_message.xml +++ b/java/com/android/dialer/widget/res/layout/fragment_message.xml @@ -14,28 +14,36 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<LinearLayout +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:gravity="bottom" android:background="@color/background_dialer_white"> - <LinearLayout - android:id="@+id/message_container" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + <ScrollView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/divider"> + + <LinearLayout + android:id="@+id/message_container" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + </ScrollView> <View + android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="@dimen/message_divider_height" - android:background="#12000000"/> + android:background="#12000000" + android:layout_above="@+id/edittext_container"/> <RelativeLayout + android:id="@+id/edittext_container" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:layout_alignParentBottom="true"> <EditText android:id="@+id/custom_message" @@ -48,7 +56,9 @@ android:textColorHint="@color/dialer_edit_text_hint_color" android:background="@color/background_dialer_white" android:textCursorDrawable="@drawable/searchedittext_custom_cursor" - android:layout_toStartOf="@+id/count_and_send_container"/> + android:layout_toStartOf="@+id/count_and_send_container" + android:inputType="textShortMessage|textCapSentences" + android:imeOptions="flagNoExtractUi|actionSend"/> <LinearLayout android:id="@+id/count_and_send_container" @@ -78,4 +88,4 @@ android:textColor="@color/dialer_edit_text_hint_color"/> </LinearLayout> </RelativeLayout> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file |