diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-05 15:29:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 15:29:54 +0000 |
commit | 43b3152d075138b11e1fe297682b3bbc775e5641 (patch) | |
tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml | |
parent | 2034759538273aed8a0b412d8fb90994eba1f7ea (diff) | |
parent | 300a8683b9c28424fb0f0c571a0abe128c461f69 (diff) |
Update Dialer to V10 RC16 am: 10b34a5ebf
am: 300a8683b9
Change-Id: If5695bad59f8a4dab6e6c90b54943b900bd2652a
Diffstat (limited to 'java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml')
-rw-r--r-- | java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml | 122 |
1 files changed, 59 insertions, 63 deletions
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml index ffbe41bbd..4abdbb25d 100644 --- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml +++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml @@ -15,72 +15,68 @@ ~ 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="2" - android:layout_columnSpan="2" - 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"/> + <LinearLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="3"> - <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"/> + <ImageView + android:id="@id/answer_message_image" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="centerCrop"/> + + <FrameLayout + android:id="@id/answer_message_frag" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1"/> + </LinearLayout> + + <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"/> + 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"/> - <FrameLayout - android:id="@id/answer_message_frag" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginTop="4dp" - android:layout_marginBottom="4dp" - android:layout_marginStart="8dp" - android:layout_column="2" - 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"/> -</GridLayout> + <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 |