Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update screenshot dark mode to spec" into rvc-dev am: d368634f25

Browse Source 
Change-Id: I216e9e76fb9968f0e3ddf56f4c669c8e48a0f142
This commit is contained in:
Miranda Kephart
2020-05-07 15:03:29 +00:00
committed by Automerger Merge Worker
parent 16a23d5b58 d368634f25
commit 844bb6e2bd
6 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/drawable/screenshot_actions_background_protection.xml
View File

@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<gradient <gradient
android:angle="90" android:angle="90"
android:startColor="#1f000000" android:startColor="@color/global_screenshot_background_protection_start"
android:endColor="#00000000"/> android:endColor="#00000000"/>
</shape> </shape>

2
packages/SystemUI/res/layout/global_screenshot.xml
View File

@@ -22,7 +22,7 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<ImageView <ImageView
android:id="@+id/global_screenshot_actions_background" 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:layout_width="match_parent"
android:alpha="0.0" android:alpha="0.0"
android:src="@drawable/screenshot_actions_background_protection" android:src="@drawable/screenshot_actions_background_protection"

1
packages/SystemUI/res/values-night/colors.xml
View File

@@ -79,6 +79,7 @@
<color name="global_screenshot_button_icon">@color/GM2_blue_300</color> <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_background">@color/GM2_grey_800</color>
<color name="global_screenshot_dismiss_foreground">#FFFFFF</color> <color name="global_screenshot_dismiss_foreground">#FFFFFF</color>
<color name="global_screenshot_background_protection_start">#80000000</color> <!-- 50% black -->
<!-- Biometric dialog colors --> <!-- Biometric dialog colors -->

4
packages/SystemUI/res/values-night/dimens.xml
View File

@@ -18,4 +18,8 @@
<resources> <resources>
<!-- The height of the divider between the individual notifications. --> <!-- The height of the divider between the individual notifications. -->
<dimen name="notification_divider_height">1dp</dimen> <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> </resources>

1
packages/SystemUI/res/values/colors.xml
View File

@@ -200,6 +200,7 @@
<color name="global_screenshot_button_icon">@color/GM2_blue_500</color> <color name="global_screenshot_button_icon">@color/GM2_blue_500</color>
<color name="global_screenshot_dismiss_background">#FFFFFF</color> <color name="global_screenshot_dismiss_background">#FFFFFF</color>
<color name="global_screenshot_dismiss_foreground">@color/GM2_grey_500</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 --> <!-- GM2 colors -->
<color name="GM2_grey_50">#F8F9FA</color> <color name="GM2_grey_50">#F8F9FA</color>

1
packages/SystemUI/res/values/dimens.xml
View File

@@ -306,6 +306,7 @@
<dimen name="global_screenshot_bg_padding">20dp</dimen> <dimen name="global_screenshot_bg_padding">20dp</dimen>
<dimen name="global_screenshot_bg_protection_height">400dp</dimen> <dimen name="global_screenshot_bg_protection_height">400dp</dimen>
<dimen name="global_screenshot_x_scale">80dp</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_preview_elevation">6dp</dimen>
<dimen name="screenshot_offset_y">48dp</dimen> <dimen name="screenshot_offset_y">48dp</dimen>
<dimen name="screenshot_offset_x">16dp</dimen> <dimen name="screenshot_offset_x">16dp</dimen>