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

Commit 639fc8a6 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Add dismiss button to clipboard overlay 

Bug: 195554988
Test: manual
Change-Id: I3224461049f070d0fbe4c2fe4f4e50289dc2aa89
parent ab4a1706

packages/SystemUI/res/layout/clipboard_content_preview.xml

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

             xmlns:app="http://schemas.android.com/apk/res-auto"

             android:id="@+id/preview_border"

             android:elevation="9dp"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:layout_marginStart="@dimen/screenshot_offset_x"

             android:layout_marginBottom="@dimen/screenshot_offset_y"

             android:layout_gravity="bottom|start"

             app:layout_constraintStart_toStartOf="parent"

             app:layout_constraintBottom_toBottomOf="parent"

             android:clipToPadding="false"

             android:clipChildren="false"

             android:padding="4dp"

             android:background="@drawable/screenshot_border"

             >

    <FrameLayout

        android:elevation="0dp"

        android:background="@drawable/screenshot_preview_background"

        android:clipChildren="true"

        android:clipToOutline="true"

        android:clipToPadding="true"

        android:layout_width="@dimen/screenshot_x_scale"

        android:layout_height="wrap_content">

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

                  android:textFontWeight="500"

                  android:padding="8dp"

                  android:gravity="center|start"

                  android:ellipsize="end"

                  android:autoSizeTextType="uniform"

                  android:autoSizeMinTextSize="10sp"

                  android:autoSizeMaxTextSize="200sp"

                  android:textColor="?android:attr/textColorPrimary"

                  android:layout_width="@dimen/screenshot_x_scale"

                  android:layout_height="@dimen/screenshot_x_scale"/>

        <ImageView

            android:id="@+id/image_preview"

            android:scaleType="fitCenter"

            android:adjustViewBounds="true"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

    </FrameLayout>

</FrameLayout>

packages/SystemUI/res/layout/clipboard_overlay.xml

+78 −3
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
<com.android.systemui.clipboardoverlay.DraggableConstraintLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_gravity="bottom"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    android:layout_height="match_parent">

    <ImageView

        android:id="@+id/actions_container_background"

        android:visibility="gone"
@@ -57,5 +56,81 @@ 
                     android:id="@+id/edit_chip"/>

        </LinearLayout>

    </HorizontalScrollView>

    <include layout="@layout/clipboard_content_preview" />

    <View

        android:id="@+id/preview_border"

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_marginStart="@dimen/overlay_offset_x"

        android:layout_marginBottom="@dimen/overlay_offset_y"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintBottom_toBottomOf="parent"

        android:elevation="@dimen/overlay_preview_elevation"

        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"/>

    <FrameLayout

        android:id="@+id/clipboard_preview"

        android:elevation="@dimen/overlay_preview_elevation"

        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_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">

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

                  android:textFontWeight="500"

                  android:padding="8dp"

                  android:gravity="center|start"

                  android:ellipsize="end"

                  android:autoSizeTextType="uniform"

                  android:autoSizeMinTextSize="10sp"

                  android:autoSizeMaxTextSize="200sp"

                  android:textColor="?android:attr/textColorPrimary"

                  android:layout_width="@dimen/clipboard_preview_size"

                  android:layout_height="@dimen/clipboard_preview_size"/>

        <ImageView

            android:id="@+id/image_preview"

            android:scaleType="fitCenter"

            android:adjustViewBounds="true"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

    </FrameLayout>

    <FrameLayout

        android:id="@+id/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:visibility="gone"

        app:layout_constraintStart_toEndOf="@id/clipboard_preview"

        app:layout_constraintEnd_toEndOf="@id/clipboard_preview"

        app:layout_constraintTop_toTopOf="@id/clipboard_preview"

        app:layout_constraintBottom_toTopOf="@id/clipboard_preview"

        android:contentDescription="@string/clipboard_dismiss_description">

        <ImageView

            android:id="@+id/dismiss_image"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_margin="@dimen/overlay_dismiss_button_margin"

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

    </FrameLayout>

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