diff options
Diffstat (limited to 'java/com/android/incallui/sessiondata')
3 files changed, 30 insertions, 16 deletions
diff --git a/java/com/android/incallui/sessiondata/MultimediaFragment.java b/java/com/android/incallui/sessiondata/MultimediaFragment.java index 85a60b6e3..3e6cdbbe0 100644 --- a/java/com/android/incallui/sessiondata/MultimediaFragment.java +++ b/java/com/android/incallui/sessiondata/MultimediaFragment.java @@ -107,6 +107,7 @@ public class MultimediaFragment extends Fragment implements AvatarPresenter { public View onCreateView( LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) { if (isSpam) { + LogUtil.i("MultimediaFragment.onCreateView", "show spam layout"); return layoutInflater.inflate(R.layout.fragment_spam, viewGroup, false); } @@ -116,23 +117,30 @@ public class MultimediaFragment extends Fragment implements AvatarPresenter { if (hasMap && MapsComponent.get(getContext()).getMaps().isAvailable()) { if (hasImage) { if (hasSubject) { + LogUtil.i("MultimediaFragment.onCreateView", "show text, image, location layout"); return layoutInflater.inflate( R.layout.fragment_composer_text_image_frag, viewGroup, false); } else { + LogUtil.i("MultimediaFragment.onCreateView", "show image, location layout"); return layoutInflater.inflate(R.layout.fragment_composer_image_frag, viewGroup, false); } } else if (hasSubject) { + LogUtil.i("MultimediaFragment.onCreateView", "show text, location layout"); return layoutInflater.inflate(R.layout.fragment_composer_text_frag, viewGroup, false); } else { + LogUtil.i("MultimediaFragment.onCreateView", "show location layout"); return layoutInflater.inflate(R.layout.fragment_composer_frag, viewGroup, false); } } else if (hasImage) { if (hasSubject) { + LogUtil.i("MultimediaFragment.onCreateView", "show text, image layout"); return layoutInflater.inflate(R.layout.fragment_composer_text_image, viewGroup, false); } else { + LogUtil.i("MultimediaFragment.onCreateView", "show image layout"); return layoutInflater.inflate(R.layout.fragment_composer_image, viewGroup, false); } } else { + LogUtil.i("MultimediaFragment.onCreateView", "show text layout"); return layoutInflater.inflate(R.layout.fragment_composer_text, viewGroup, false); } } @@ -155,11 +163,11 @@ public class MultimediaFragment extends Fragment implements AvatarPresenter { ((TextView) view.findViewById(R.id.spam_text)).setText(R.string.spam_message_text); } - TextView messageText = (TextView) view.findViewById(R.id.answer_message_text); + TextView messageText = view.findViewById(R.id.answer_message_text); if (messageText != null) { messageText.setText(getSubject()); } - ImageView mainImage = (ImageView) view.findViewById(R.id.answer_message_image); + ImageView mainImage = view.findViewById(R.id.answer_message_image); if (mainImage != null) { Glide.with(this) .load(getImageUri()) @@ -185,6 +193,7 @@ public class MultimediaFragment extends Fragment implements AvatarPresenter { Target<Drawable> target, DataSource dataSource, boolean isFirstResource) { + LogUtil.enterBlock("MultimediaFragment.onResourceReady"); view.findViewById(R.id.loading_spinner).setVisibility(View.GONE); return false; } @@ -192,7 +201,7 @@ public class MultimediaFragment extends Fragment implements AvatarPresenter { .into(mainImage); mainImage.setClipToOutline(true); } - FrameLayout fragmentHolder = (FrameLayout) view.findViewById(R.id.answer_message_frag); + FrameLayout fragmentHolder = view.findViewById(R.id.answer_message_frag); if (fragmentHolder != null) { fragmentHolder.setClipToOutline(true); Fragment mapFragment = @@ -202,7 +211,7 @@ public class MultimediaFragment extends Fragment implements AvatarPresenter { .replace(R.id.answer_message_frag, mapFragment) .commitNow(); } - avatarImageView = ((ImageView) view.findViewById(R.id.answer_message_avatar)); + avatarImageView = view.findViewById(R.id.answer_message_avatar); if (avatarImageView != null) { avatarImageView.setVisibility(showAvatar ? View.VISIBLE : View.GONE); } diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml index ed29e78c4..3b3327d4f 100644 --- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml +++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml @@ -24,8 +24,8 @@ <ImageView android:id="@id/answer_message_image" - android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_height="match_parent" android:layout_marginTop="@dimen/answer_message_contents_margin_top" android:layout_marginBottom="4dp" android:layout_centerInParent="true" @@ -34,7 +34,7 @@ android:background="@drawable/answer_data_background" android:elevation="@dimen/answer_data_elevation" android:adjustViewBounds="true" - android:scaleType="fitCenter"/> + android:scaleType="centerCrop"/> <ProgressBar android:layout_width="wrap_content" diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml index d2147ea62..b93db63ad 100644 --- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml +++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml @@ -16,29 +16,34 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" 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"> - <TextView + <android.support.v7.widget.AppCompatTextView android:id="@id/answer_message_text" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/answer_message_contents_margin_top" android:layout_marginBottom="4dp" android:layout_centerHorizontal="true" android:layout_alignTop="@+id/answer_message_avatar" - android:paddingTop="44dp" - android:paddingBottom="44dp" - android:paddingStart="18dp" - android:paddingEnd="18dp" - android:background="@drawable/answer_text_only_background" android:elevation="@dimen/answer_data_elevation" - android:gravity="center_horizontal" + android:gravity="center" + android:paddingTop="22dp" + android:paddingBottom="22dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:minHeight="108dp" + android:lineSpacingMultiplier="1.2" android:textColor="@color/background_dialer_white" - android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/> + android:textAppearance="@style/Dialer.Incall.TextAppearance.Message" + android:background="@drawable/answer_text_only_background" + app:autoSizeTextType="uniform" + app:autoSizeMaxTextSize="44sp"/> <ImageView android:id="@id/answer_message_avatar" |