From 92991b7ef0acf639a615031118ab65c305858ffc Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Mon, 28 Jun 2021 13:43:41 -0400
Subject: [PATCH] Add cancel button to long screenshot UI

Bug: 191889955
Test: Do long screenshot, ensure nothing is saved when cancel is
      pressed.
Change-Id: Iae75a9ad65b1a4c43e9d7b855a5aa7850681a4d0
---
 ...und.xml => screenshot_button_background.xml} |  2 +-
 .../SystemUI/res/layout/long_screenshot.xml     | 17 ++++++++++++++++-
 .../screenshot/LongScreenshotActivity.java      |  2 ++
 3 files changed, 19 insertions(+), 2 deletions(-)
 rename packages/SystemUI/res/drawable/{screenshot_save_background.xml => screenshot_button_background.xml} (95%)

diff --git a/packages/SystemUI/res/drawable/screenshot_save_background.xml b/packages/SystemUI/res/drawable/screenshot_button_background.xml
similarity index 95%
rename from packages/SystemUI/res/drawable/screenshot_save_background.xml
rename to packages/SystemUI/res/drawable/screenshot_button_background.xml
index b61b28ed1d9ed..3c39fe2ecb066 100644
--- a/packages/SystemUI/res/drawable/screenshot_save_background.xml
+++ b/packages/SystemUI/res/drawable/screenshot_button_background.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<!-- Long screenshot save button background -->
+<!-- Long screenshot save/cancel button background -->
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
         android:color="?android:textColorPrimary">
diff --git a/packages/SystemUI/res/layout/long_screenshot.xml b/packages/SystemUI/res/layout/long_screenshot.xml
index 50f38b6fa67f1..8dfe79e4dda62 100644
--- a/packages/SystemUI/res/layout/long_screenshot.xml
+++ b/packages/SystemUI/res/layout/long_screenshot.xml
@@ -32,12 +32,27 @@
         android:text="@string/save"
         android:layout_marginStart="8dp"
         android:layout_marginTop="4dp"
-        android:background="@drawable/screenshot_save_background"
+        android:background="@drawable/screenshot_button_background"
         android:textColor="?android:textColorSecondary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/preview" />
 
+    <Button
+        android:id="@+id/cancel"
+        style="@android:style/Widget.DeviceDefault.Button.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:text="@android:string/cancel"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="4dp"
+        android:background="@drawable/screenshot_button_background"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintStart_toEndOf="@id/save"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/preview"
+    />
+
     <ImageButton
         android:id="@+id/share"
         style="@android:style/Widget.Material.Button.Borderless"
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
index 741dddc493784..35637f66d0df1 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/LongScreenshotActivity.java
@@ -126,6 +126,8 @@ public class LongScreenshotActivity extends Activity {
         mTransitionView = requireViewById(R.id.transition);
         mEnterTransitionView = requireViewById(R.id.enter_transition);
 
+        requireViewById(R.id.cancel).setOnClickListener(v -> finishAndRemoveTask());
+
         mSave.setOnClickListener(this::onClicked);
         mEdit.setOnClickListener(this::onClicked);
         mShare.setOnClickListener(this::onClicked);