diff options
Diffstat (limited to 'java/com/android/dialer/widget/res/layout')
3 files changed, 82 insertions, 14 deletions
diff --git a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml index c4aac65fb..023b0ffe2 100644 --- a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml +++ b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml @@ -29,7 +29,9 @@ android:gravity="top" android:textSize="@dimen/toolbar_title_text_size" android:textColor="@color/background_dialer_white" - android:fontFamily="sans-serif-medium"/> + android:fontFamily="sans-serif-medium" + android:maxLines="1" + android:ellipsize="end"/> <TextView android:id="@+id/subtitle" @@ -37,6 +39,8 @@ android:layout_height="wrap_content" android:textSize="@dimen/toolbar_subtitle_text_size" android:textColor="@color/background_dialer_white" - android:visibility="gone"/> + android:visibility="gone" + android:maxLines="1" + android:ellipsize="end"/> </LinearLayout> </merge>
\ No newline at end of file diff --git a/java/com/android/dialer/widget/res/layout/empty_content_view.xml b/java/com/android/dialer/widget/res/layout/empty_content_view.xml new file mode 100644 index 000000000..177744385 --- /dev/null +++ b/java/com/android/dialer/widget/res/layout/empty_content_view.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <ImageView + android:id="@+id/empty_list_view_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal"/> + + <TextView + android:id="@+id/empty_list_view_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:gravity="center_horizontal|top" + android:textColor="@color/empty_list_text_color" + android:textSize="@dimen/empty_list_message_text_size"/> + + <TextView + android:id="@+id/empty_list_view_action" + style="@style/TextActionStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:background="?android:attr/selectableItemBackground" + android:clickable="true" + android:gravity="center_horizontal"/> + + <Space + android:layout_width="match_parent" + android:layout_height="40dp"/> + +</merge> 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 |