From 2320e509ebe8b98a6279d74905928ef74d429634 Mon Sep 17 00:00:00 2001
From: Miranda Kephart <mkephart@google.com>
Date: Thu, 30 Apr 2020 20:47:47 -0400
Subject: [PATCH] Update screenshot dark mode to spec

Makes the background protection scrim slightly taller in dark mode,
and makes the light mode scrim darker (25% opacity at the bottom).

Test: manual
Bug: 155416835
Fix: 155416835

Change-Id: I3c5f9f75654b4c359cc0b1486d79f7fdeea7b6af
---
 .../res/drawable/screenshot_actions_background_protection.xml | 2 +-
 packages/SystemUI/res/layout/global_screenshot.xml            | 2 +-
 packages/SystemUI/res/values-night/colors.xml                 | 1 +
 packages/SystemUI/res/values-night/dimens.xml                 | 4 ++++
 packages/SystemUI/res/values/colors.xml                       | 1 +
 packages/SystemUI/res/values/dimens.xml                       | 1 +
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml b/packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml
index 163015b7b0f07..21013c6c7b164 100644
--- a/packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml
+++ b/packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <gradient
         android:angle="90"
-        android:startColor="#1f000000"
+        android:startColor="@color/global_screenshot_background_protection_start"
         android:endColor="#00000000"/>
 </shape>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/global_screenshot.xml b/packages/SystemUI/res/layout/global_screenshot.xml
index de19303b4948d..1dbb38d5dc7a1 100644
--- a/packages/SystemUI/res/layout/global_screenshot.xml
+++ b/packages/SystemUI/res/layout/global_screenshot.xml
@@ -22,7 +22,7 @@
     android:layout_height="match_parent">
     <ImageView
         android:id="@+id/global_screenshot_actions_background"
-        android:layout_height="@dimen/global_screenshot_bg_protection_height"
+        android:layout_height="@dimen/screenshot_bg_protection_height"
         android:layout_width="match_parent"
         android:alpha="0.0"
         android:src="@drawable/screenshot_actions_background_protection"
diff --git a/packages/SystemUI/res/values-night/colors.xml b/packages/SystemUI/res/values-night/colors.xml
index 2d51011042377..196357c4794e8 100644
--- a/packages/SystemUI/res/values-night/colors.xml
+++ b/packages/SystemUI/res/values-night/colors.xml
@@ -79,6 +79,7 @@
     <color name="global_screenshot_button_icon">@color/GM2_blue_300</color>
     <color name="global_screenshot_dismiss_background">@color/GM2_grey_800</color>
     <color name="global_screenshot_dismiss_foreground">#FFFFFF</color>
+    <color name="global_screenshot_background_protection_start">#80000000</color> <!-- 50% black -->
 
 
     <!-- Biometric dialog colors -->
diff --git a/packages/SystemUI/res/values-night/dimens.xml b/packages/SystemUI/res/values-night/dimens.xml
index 481483991de92..23e3231128450 100644
--- a/packages/SystemUI/res/values-night/dimens.xml
+++ b/packages/SystemUI/res/values-night/dimens.xml
@@ -18,4 +18,8 @@
 <resources>
     <!-- The height of the divider between the individual notifications. -->
     <dimen name="notification_divider_height">1dp</dimen>
+
+    <!-- Height of the background gradient behind the screenshot UI (taller in dark mode) -->
+    <dimen name="screenshot_bg_protection_height">375dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index 82eda311da6ae..b6776005d83e6 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -200,6 +200,7 @@
     <color name="global_screenshot_button_icon">@color/GM2_blue_500</color>
     <color name="global_screenshot_dismiss_background">#FFFFFF</color>
     <color name="global_screenshot_dismiss_foreground">@color/GM2_grey_500</color>
+    <color name="global_screenshot_background_protection_start">#40000000</color> <!-- 25% black -->
 
     <!-- GM2 colors -->
     <color name="GM2_grey_50">#F8F9FA</color>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 7073ffd8d1dd2..45f7ce5ed9202 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -306,6 +306,7 @@
     <dimen name="global_screenshot_bg_padding">20dp</dimen>
     <dimen name="global_screenshot_bg_protection_height">400dp</dimen>
     <dimen name="global_screenshot_x_scale">80dp</dimen>
+    <dimen name="screenshot_bg_protection_height">242dp</dimen>
     <dimen name="screenshot_preview_elevation">6dp</dimen>
     <dimen name="screenshot_offset_y">48dp</dimen>
     <dimen name="screenshot_offset_x">16dp</dimen>