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

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

Merge "Fix screenshot_static ConstraintLayout" into tm-qpr-dev am: af40c789 

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



Change-Id: I354037049a64a30539f198f8787942b4390c4bd6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35c0fc92 af40c789

packages/SystemUI/res/layout/clipboard_overlay.xml

+21 −35
Original line number Diff line number Diff line
@@ -32,26 +32,26 @@ 
        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"

        android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="@+id/actions_container"

        app:layout_constraintEnd_toEndOf="@+id/actions_container"/>

        app:layout_constraintEnd_toEndOf="@+id/actions_container"

        app:layout_constraintBottom_toBottomOf="parent"/>

    <HorizontalScrollView

        android:id="@+id/actions_container"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_marginEnd="@dimen/overlay_action_container_margin_horizontal"

        android:paddingEnd="@dimen/overlay_action_container_padding_right"

        android:paddingEnd="@dimen/overlay_action_container_padding_end"

        android:paddingVertical="@dimen/overlay_action_container_padding_vertical"

        android:elevation="4dp"

        android:scrollbars="none"

        android:layout_marginBottom="4dp"

        app:layout_constraintHorizontal_bias="0"

        app:layout_constraintWidth_percent="1.0"

        app:layout_constraintWidth_max="wrap"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintStart_toEndOf="@+id/preview_border"

        app:layout_constraintEnd_toEndOf="parent">

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="@id/actions_container_background">

        <LinearLayout

            android:id="@+id/actions"

            android:layout_width="wrap_content"
@@ -69,44 +69,30 @@ 
        android:id="@+id/preview_border"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_marginStart="@dimen/overlay_offset_x"

        android:layout_marginBottom="12dp"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        android:layout_marginStart="@dimen/overlay_preview_container_margin"

        android:layout_marginTop="@dimen/overlay_border_width_neg"

        android:layout_marginEnd="@dimen/overlay_border_width_neg"

        android:layout_marginBottom="@dimen/overlay_preview_container_margin"

        android:elevation="7dp"

        app:layout_constraintEnd_toEndOf="@id/clipboard_preview_end"

        app:layout_constraintTop_toTopOf="@id/clipboard_preview_top"

        android:background="@drawable/overlay_border"/>

    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/clipboard_preview_end"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:barrierMargin="@dimen/overlay_border_width"

        app:barrierDirection="end"

        app:constraint_referenced_ids="clipboard_preview"/>

    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/clipboard_preview_top"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:barrierDirection="top"

        app:barrierMargin="@dimen/overlay_border_width_neg"

        app:constraint_referenced_ids="clipboard_preview"/>

        android:background="@drawable/overlay_border"

        app:layout_constraintStart_toStartOf="@id/actions_container_background"

        app:layout_constraintTop_toTopOf="@id/clipboard_preview"

        app:layout_constraintEnd_toEndOf="@id/clipboard_preview"

        app:layout_constraintBottom_toBottomOf="@id/actions_container_background"/>

    <FrameLayout

        android:id="@+id/clipboard_preview"

        android:layout_width="@dimen/clipboard_preview_size"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/overlay_border_width"

        android:layout_marginBottom="@dimen/overlay_border_width"

        android:layout_gravity="center"

        android:elevation="7dp"

        android:background="@drawable/overlay_preview_background"

        android:clipChildren="true"

        android:clipToOutline="true"

        android:clipToPadding="true"

        android:layout_width="@dimen/clipboard_preview_size"

        android:layout_margin="@dimen/overlay_border_width"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        app:layout_constraintHorizontal_bias="0"

        app:layout_constraintBottom_toBottomOf="@id/preview_border"

        app:layout_constraintStart_toStartOf="@id/preview_border"

        app:layout_constraintEnd_toEndOf="@id/preview_border"

        app:layout_constraintTop_toTopOf="@id/preview_border">

        app:layout_constraintBottom_toBottomOf="@id/preview_border">

        <TextView android:id="@+id/text_preview"

                  android:textFontWeight="500"

                  android:padding="8dp"

packages/SystemUI/res/layout/screenshot_static.xml

+18 −32
Original line number Diff line number Diff line
@@ -27,26 +27,26 @@ 
        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"

        android:layout_marginBottom="@dimen/overlay_action_container_margin_bottom"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="@+id/actions_container"

        app:layout_constraintEnd_toEndOf="@+id/actions_container"/>

        app:layout_constraintEnd_toEndOf="@+id/actions_container"

        app:layout_constraintBottom_toTopOf="@id/screenshot_message_container"/>

    <HorizontalScrollView

        android:id="@+id/actions_container"

        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:paddingEnd="@dimen/overlay_action_container_padding_end"

        android:paddingVertical="@dimen/overlay_action_container_padding_vertical"

        android:elevation="4dp"

        android:scrollbars="none"

        app:layout_constraintHorizontal_bias="0"

        app:layout_constraintWidth_percent="1.0"

        app:layout_constraintWidth_max="wrap"

        app:layout_constraintBottom_toTopOf="@id/screenshot_message_container"

        app:layout_constraintStart_toEndOf="@+id/screenshot_preview_border"

        app:layout_constraintEnd_toEndOf="parent">

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintBottom_toBottomOf="@id/actions_container_background">

        <LinearLayout

            android:id="@+id/screenshot_actions"

            android:layout_width="wrap_content"
@@ -64,35 +64,24 @@ 
        android:id="@+id/screenshot_preview_border"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_marginStart="@dimen/overlay_offset_x"

        android:layout_marginBottom="12dp"

        android:layout_marginStart="@dimen/overlay_preview_container_margin"

        android:layout_marginTop="@dimen/overlay_border_width_neg"

        android:layout_marginEnd="@dimen/overlay_border_width_neg"

        android:layout_marginBottom="@dimen/overlay_preview_container_margin"

        android:elevation="7dp"

        android:alpha="0"

        android:background="@drawable/overlay_border"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toTopOf="@id/screenshot_message_container"

        app:layout_constraintEnd_toEndOf="@id/screenshot_preview_end"

        app:layout_constraintTop_toTopOf="@id/screenshot_preview_top"/>

    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/screenshot_preview_end"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:barrierMargin="@dimen/overlay_border_width"

        app:barrierDirection="end"

        app:constraint_referenced_ids="screenshot_preview"/>

    <androidx.constraintlayout.widget.Barrier

        android:id="@+id/screenshot_preview_top"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        app:barrierDirection="top"

        app:barrierMargin="@dimen/overlay_border_width_neg"

        app:constraint_referenced_ids="screenshot_preview"/>

        app:layout_constraintStart_toStartOf="@id/actions_container_background"

        app:layout_constraintTop_toTopOf="@id/screenshot_preview"

        app:layout_constraintEnd_toEndOf="@id/screenshot_preview"

        app:layout_constraintBottom_toBottomOf="@id/actions_container_background"/>

    <ImageView

        android:id="@+id/screenshot_preview"

        android:visibility="invisible"

        android:layout_width="@dimen/overlay_x_scale"

        android:layout_margin="@dimen/overlay_border_width"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/overlay_border_width"

        android:layout_marginBottom="@dimen/overlay_border_width"

        android:layout_gravity="center"

        android:elevation="7dp"

        android:contentDescription="@string/screenshot_edit_description"
@@ -100,11 +89,8 @@ 
        android:background="@drawable/overlay_preview_background"

        android:adjustViewBounds="true"

        android:clickable="true"

        app:layout_constraintHorizontal_bias="0"

        app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border"

        app:layout_constraintStart_toStartOf="@id/screenshot_preview_border"

        app:layout_constraintEnd_toEndOf="@id/screenshot_preview_border"

        app:layout_constraintTop_toTopOf="@id/screenshot_preview_border"/>

        app:layout_constraintBottom_toBottomOf="@id/screenshot_preview_border"/>

    <ImageView

        android:id="@+id/screenshot_badge"

        android:layout_width="24dp"
@@ -150,7 +136,7 @@ 
        android:layout_height="wrap_content"

        android:layout_marginHorizontal="@dimen/overlay_action_container_margin_horizontal"

        android:layout_marginVertical="4dp"

        android:paddingHorizontal="@dimen/overlay_action_container_padding_right"

        android:paddingHorizontal="@dimen/overlay_action_container_padding_end"

        android:paddingVertical="@dimen/overlay_action_container_padding_vertical"

        android:elevation="4dp"

        android:background="@drawable/action_chip_container_background"

packages/SystemUI/res/values/dimens.xml

+8 −1
Original line number Diff line number Diff line
@@ -334,15 +334,22 @@ 
    <dimen name="overlay_action_chip_spacing">8dp</dimen>

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

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

    <!-- Used for both start and bottom margin of the preview, relative to the action container -->

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

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

    <dimen name="overlay_action_container_margin_bottom">4dp</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_action_container_padding_end">8dp</dimen>

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

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

    <!-- must be kept aligned with overlay_border_width_neg, below;

         overlay_border_width = overlay_border_width_neg * -1 -->

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

    <!-- need a negative margin for some of the constraints. should be overlay_border_width * -1 -->

    <!-- some constraints use a negative margin. must be aligned with overlay_border_width, above;

         overlay_border_width_neg = overlay_border_width * -1 -->

    <dimen name="overlay_border_width_neg">-4dp</dimen>



    <dimen name="clipboard_preview_size">@dimen/overlay_x_scale</dimen>

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

+1 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ public class ScreenshotView extends FrameLayout implements 
        mScreenshotBadge.setVisibility(View.GONE);

        mScreenshotBadge.setImageDrawable(null);

        mPendingSharedTransition = false;

        mActionsContainerBackground.setVisibility(View.GONE);

        mActionsContainerBackground.setVisibility(View.INVISIBLE);

        mActionsContainer.setVisibility(View.GONE);

        mDismissButton.setVisibility(View.GONE);

        mScrollingScrim.setVisibility(View.GONE);