Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 329870aa authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Use drop shadow for screenshots instead of scrim" into tm-dev am:... 

Merge "Use drop shadow for screenshots instead of scrim" into tm-dev am: 75cfd645 am: 7e9f4828 am: f5fd08c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122037



Change-Id: I74160102c10e2f73870148071a07243bfb7ea1f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f7dd48fe f5fd08c6

packages/SystemUI/res/layout/clipboard_overlay.xml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_marginStart="@dimen/overlay_offset_x"

        android:layout_marginBottom="@dimen/overlay_offset_y"

        android:layout_marginBottom="8dp"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toBottomOf="@id/actions_container_background"

        android:elevation="7dp"

packages/SystemUI/res/layout/screenshot.xml

+1 −8
Original line number Diff line number Diff line
@@ -28,19 +28,12 @@ 
        android:visibility="gone"

        android:clickable="true"

        android:importantForAccessibility="no"/>

    <ImageView

        android:id="@+id/screenshot_actions_background"

        android:layout_height="@dimen/overlay_bg_protection_height"

        android:layout_width="match_parent"

        android:layout_gravity="bottom"

        android:alpha="0.0"

        android:src="@drawable/overlay_actions_background_protection"/>

    <ImageView

        android:id="@+id/screenshot_flash"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone"

        android:elevation="@dimen/overlay_preview_elevation"

        android:elevation="7dp"

        android:src="@android:color/white"/>

    <com.android.systemui.screenshot.ScreenshotSelectorView

        android:id="@+id/screenshot_selector"

packages/SystemUI/res/layout/screenshot_static.xml

+8 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        android:visibility="gone"

        android:layout_height="0dp"

        android:layout_width="0dp"

        android:elevation="1dp"

        android:elevation="4dp"

        android:background="@drawable/action_chip_container_background"

        android:layout_marginStart="@dimen/overlay_action_container_margin_horizontal"

        app:layout_constraintBottom_toBottomOf="@+id/actions_container"
@@ -36,9 +36,10 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal"

        android:layout_marginBottom="4dp"

        android:paddingEnd="@dimen/overlay_action_container_padding_right"

        android:paddingVertical="@dimen/overlay_action_container_padding_vertical"

        android:elevation="1dp"

        android:elevation="4dp"

        android:scrollbars="none"

        app:layout_constraintHorizontal_bias="0"

        app:layout_constraintWidth_percent="1.0"
@@ -64,8 +65,8 @@ 
        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_marginStart="@dimen/overlay_offset_x"

        android:layout_marginBottom="@dimen/overlay_offset_y"

        android:elevation="@dimen/overlay_preview_elevation"

        android:layout_marginBottom="12dp"

        android:elevation="7dp"

        android:alpha="0"

        android:background="@drawable/overlay_border"

        app:layout_constraintStart_toStartOf="parent"
@@ -93,7 +94,7 @@ 
        android:layout_margin="@dimen/overlay_border_width"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:elevation="@dimen/overlay_preview_elevation"

        android:elevation="7dp"

        android:contentDescription="@string/screenshot_edit_description"

        android:scaleType="fitEnd"

        android:background="@drawable/overlay_preview_background"
@@ -108,7 +109,7 @@ 
        android:id="@+id/screenshot_dismiss_button"

        android:layout_width="@dimen/overlay_dismiss_button_tappable_size"

        android:layout_height="@dimen/overlay_dismiss_button_tappable_size"

        android:elevation="@dimen/overlay_dismiss_button_elevation"

        android:elevation="10dp"

        android:visibility="gone"

        app:layout_constraintStart_toEndOf="@id/screenshot_preview"

        app:layout_constraintEnd_toEndOf="@id/screenshot_preview"
@@ -130,5 +131,5 @@ 
        android:visibility="gone"

        app:layout_constraintStart_toStartOf="@id/screenshot_preview"

        app:layout_constraintTop_toTopOf="@id/screenshot_preview"

        android:elevation="@dimen/overlay_preview_elevation"/>

        android:elevation="7dp"/>

</com.android.systemui.screenshot.DraggableConstraintLayout>

packages/SystemUI/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -282,15 +282,12 @@ 
    <!-- Spacing between chip icon and chip text -->

    <dimen name="overlay_action_chip_spacing">8dp</dimen>

    <dimen name="overlay_action_chip_text_size">14sp</dimen>

    <dimen name="overlay_offset_y">8dp</dimen>

    <dimen name="overlay_offset_x">16dp</dimen>

    <dimen name="overlay_preview_elevation">4dp</dimen>

    <dimen name="overlay_action_container_margin_horizontal">8dp</dimen>

    <dimen name="overlay_bg_protection_height">242dp</dimen>

    <dimen name="overlay_action_container_corner_radius">18dp</dimen>

    <dimen name="overlay_action_container_padding_vertical">4dp</dimen>

    <dimen name="overlay_action_container_padding_right">8dp</dimen>

    <dimen name="overlay_dismiss_button_elevation">7dp</dimen>

    <dimen name="overlay_dismiss_button_tappable_size">48dp</dimen>

    <dimen name="overlay_dismiss_button_margin">8dp</dimen>

    <dimen name="overlay_border_width">4dp</dimen>

packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java

+0 −16
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ public class ScreenshotView extends FrameLayout implements 
    private ImageView mActionsContainerBackground;

    private HorizontalScrollView mActionsContainer;

    private LinearLayout mActionsView;

    private ImageView mBackgroundProtection;

    private FrameLayout mDismissButton;

    private OverlayActionChip mShareChip;

    private OverlayActionChip mEditChip;
@@ -345,8 +344,6 @@ public class ScreenshotView extends FrameLayout implements 
                R.id.actions_container_background));

        mActionsContainer = requireNonNull(findViewById(R.id.actions_container));

        mActionsView = requireNonNull(findViewById(R.id.screenshot_actions));

        mBackgroundProtection = requireNonNull(

                findViewById(R.id.screenshot_actions_background));

        mDismissButton = requireNonNull(findViewById(R.id.screenshot_dismiss_button));

        mScrollablePreview = requireNonNull(findViewById(R.id.screenshot_scrollable_preview));

        mScreenshotFlash = requireNonNull(findViewById(R.id.screenshot_flash));
@@ -394,14 +391,6 @@ public class ScreenshotView extends FrameLayout implements 
                }

                mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SWIPE_DISMISSED, 0,

                        mPackageName);

                animator.addListener(new AnimatorListenerAdapter() {

                    @Override

                    public void onAnimationStart(Animator animation) {

                        super.onAnimationStart(animation);

                        mBackgroundProtection.animate()

                                .alpha(0).setDuration(animation.getDuration()).start();

                    }

                });

            }



            @Override
@@ -704,7 +693,6 @@ public class ScreenshotView extends FrameLayout implements 


        animator.addUpdateListener(animation -> {

            float t = animation.getAnimatedFraction();

            mBackgroundProtection.setAlpha(t);

            float containerAlpha = t < alphaFraction ? t / alphaFraction : 1;

            mActionsContainer.setAlpha(containerAlpha);

            mActionsContainerBackground.setAlpha(containerAlpha);
@@ -910,7 +898,6 @@ public class ScreenshotView extends FrameLayout implements 
        }

        mDismissButton.setVisibility(View.GONE);

        mActionsContainer.setVisibility(View.GONE);

        mBackgroundProtection.setVisibility(View.GONE);

        // set these invisible, but not gone, so that the views are laid out correctly

        mActionsContainerBackground.setVisibility(View.INVISIBLE);

        mScreenshotPreviewBorder.setVisibility(View.INVISIBLE);
@@ -932,7 +919,6 @@ public class ScreenshotView extends FrameLayout implements 
            mDismissButton.setVisibility(View.VISIBLE);

        }

        mActionsContainer.setVisibility(View.VISIBLE);

        mBackgroundProtection.setVisibility(View.VISIBLE);

        mActionsContainerBackground.setVisibility(View.VISIBLE);

        mScreenshotPreviewBorder.setVisibility(View.VISIBLE);

        mScreenshotPreview.setVisibility(View.VISIBLE);
@@ -969,7 +955,6 @@ public class ScreenshotView extends FrameLayout implements 
        mPendingSharedTransition = false;

        mActionsContainerBackground.setVisibility(View.GONE);

        mActionsContainer.setVisibility(View.GONE);

        mBackgroundProtection.setAlpha(0f);

        mDismissButton.setVisibility(View.GONE);

        mScrollingScrim.setVisibility(View.GONE);

        mScrollablePreview.setVisibility(View.GONE);
@@ -1016,7 +1001,6 @@ public class ScreenshotView extends FrameLayout implements 
            mDismissButton.setAlpha(alpha);

            mActionsContainerBackground.setAlpha(alpha);

            mActionsContainer.setAlpha(alpha);

            mBackgroundProtection.setAlpha(alpha);

            mScreenshotPreviewBorder.setAlpha(alpha);

        });

        alphaAnim.setDuration(600);