diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-05 15:23:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 15:23:13 +0000 |
commit | 300a8683b9c28424fb0f0c571a0abe128c461f69 (patch) | |
tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml | |
parent | d67f1627521b174f12e0c247f154c7c93c5e408e (diff) | |
parent | 10b34a5ebf12e97ecba0caf3c8e30b476b038a96 (diff) |
Update Dialer to V10 RC16
am: 10b34a5ebf
Change-Id: Iea3e96ccdeaf1fa796ceca702cace82ca20f298c
Diffstat (limited to 'java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml')
-rw-r--r-- | java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml | 95 |
1 files changed, 47 insertions, 48 deletions
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml index 4e6fcbadb..828675b6b 100644 --- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml +++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml @@ -15,56 +15,55 @@ ~ limitations under the License --> -<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="16dp" - android:paddingStart="16dp" - android:paddingEnd="24dp" - android:orientation="horizontal"> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingStart="@dimen/answer_message_margin_start_end" + android:paddingEnd="@dimen/answer_message_margin_start_end"> - <ImageView - android:id="@id/answer_message_avatar" - android:layout_width="@dimen/answer_message_avatar_size" - android:layout_height="@dimen/answer_message_avatar_size" - android:layout_rowSpan="2" - android:elevation="@dimen/answer_data_elevation"/> + <LinearLayout + android:id="@id/answer_message_container" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="@dimen/answer_message_contents_margin_top" + android:layout_alignTop="@+id/answer_message_avatar" + android:layout_marginBottom="@dimen/answer_data_elevation" + android:elevation="@dimen/answer_data_elevation" + android:background="@drawable/answer_data_background" + android:outlineProvider="background"> - <TextView - android:id="@id/answer_message_text" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginStart="8dp" - android:layout_columnWeight="1" - android:layout_rowWeight="1" - android:padding="18dp" - android:background="@drawable/answer_data_background" - android:elevation="@dimen/answer_data_elevation" - android:gravity="center_vertical" - android:maxLines="2" - android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/> + <ImageView + android:id="@id/answer_message_image" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="3" + android:scaleType="centerCrop"/> - <ImageView - android:id="@id/answer_message_image" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" - android:layout_marginStart="8dp" - android:layout_column="1" - android:layout_columnWeight="1" - android:layout_row="1" - android:layout_rowWeight="1" - android:background="@drawable/answer_data_background" - android:elevation="@dimen/answer_data_elevation" - android:outlineProvider="background" - android:scaleType="centerCrop"/> + <TextView + android:id="@id/answer_message_text" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="2" + android:paddingStart="18dp" + android:paddingEnd="18dp" + android:gravity="center" + android:maxLines="2" + android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/> + </LinearLayout> <ProgressBar - android:id="@+id/loading_spinner" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_column="1" - android:layout_gravity="center" - android:elevation="2dp"/> -</GridLayout> + android:id="@+id/loading_spinner" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:elevation="@dimen/answer_data_elevation"/> + + <ImageView + android:id="@id/answer_message_avatar" + android:layout_width="@dimen/answer_message_avatar_size" + android:layout_height="@dimen/answer_message_avatar_size" + android:layout_centerHorizontal="true" + android:elevation="@dimen/answer_avatar_elevation"/> +</RelativeLayout>
\ No newline at end of file |