From 6d9518a2706d65e7e749e95b290d4bfc41312a55 Mon Sep 17 00:00:00 2001 From: Andrey Epin Date: Tue, 7 Feb 2023 17:05:45 -0800 Subject: Fix image + text layout; add transition animation Fix image preview elements paddings, an artifact of a logical merge conflict. Add transition animation. Bug: 262277421 Test: manual testing Change-Id: I1c87369a4aecb9ba576f37553da80eb53d3b7a1a --- java/res/layout/chooser_grid_preview_image.xml | 5 +---- java/res/layout/chooser_image_preview_view.xml | 2 ++ java/res/layout/scrollable_image_preview_view.xml | 2 ++ java/src/com/android/intentresolver/ChooserContentPreviewUi.java | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) (limited to 'java') diff --git a/java/res/layout/chooser_grid_preview_image.xml b/java/res/layout/chooser_grid_preview_image.xml index 80c12e6c..614d9b5e 100644 --- a/java/res/layout/chooser_grid_preview_image.xml +++ b/java/res/layout/chooser_grid_preview_image.xml @@ -43,10 +43,7 @@ android:id="@+id/image_preview_stub" android:inflatedId="@androidprv:id/content_preview_image_area" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingStart="@dimen/chooser_edge_margin_normal" - android:paddingEnd="@dimen/chooser_edge_margin_normal" - android:background="?android:attr/colorBackground" /> + android:layout_height="wrap_content" /> diff --git a/java/res/layout/scrollable_image_preview_view.xml b/java/res/layout/scrollable_image_preview_view.xml index ff2f273f..c6c310e6 100644 --- a/java/res/layout/scrollable_image_preview_view.xml +++ b/java/res/layout/scrollable_image_preview_view.xml @@ -20,5 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:paddingStart="@dimen/chooser_edge_margin_normal" + android:paddingEnd="@dimen/chooser_edge_margin_normal" android:paddingBottom="@dimen/chooser_view_spacing" android:background="?android:attr/colorBackground" /> diff --git a/java/src/com/android/intentresolver/ChooserContentPreviewUi.java b/java/src/com/android/intentresolver/ChooserContentPreviewUi.java index 91abd9d0..1acb4d57 100644 --- a/java/src/com/android/intentresolver/ChooserContentPreviewUi.java +++ b/java/src/com/android/intentresolver/ChooserContentPreviewUi.java @@ -33,6 +33,7 @@ import android.provider.Downloads; import android.provider.OpenableColumns; import android.text.TextUtils; import android.text.util.Linkify; +import android.transition.TransitionManager; import android.util.Log; import android.util.PluralsMessageFormatter; import android.view.LayoutInflater; @@ -440,6 +441,7 @@ public final class ChooserContentPreviewUi { shareTextAction.accept(false); actionView.setOnCheckedChangeListener((view, isChecked) -> { view.setText(actionLabels[isChecked ? 1 : 0]); + TransitionManager.beginDelayedTransition((ViewGroup) textView.getParent()); textView.setVisibility(isChecked ? View.VISIBLE : View.GONE); shareTextAction.accept(!isChecked); }); -- cgit v1.2.3-59-g8ed1b