From 726f3b448033fe84792c161467e96141a4abb727 Mon Sep 17 00:00:00 2001
From: Brandon Dayauon <brdayauon@google.com>
Date: Mon, 20 May 2024 14:29:44 -0700
Subject: [PATCH 1/2] Update install app icon colors to spec:

The + in the icon is onSurface.
Everything else within the circle is material_color_surface_container_lowest.

spec: https://docs.google.com/presentation/d/1_f2nAcmZMywF0D1-9fJv1slUQVerIpJ0b1uUmZDpKXo/edit?resourcekey=0-nxjnkIp8z-ECp8angeQJZg#slide=id.g239ecda44ed_0_18

bug: 340307977
Test:
before: https://screenshot.googleplex.com/Bss6VHDt7JfjsEU
after: https://screenshot.googleplex.com/5qxqQ6segow2Nxh
Flag: None
Change-Id: I300e8513d15e428338cb1e20f65fbe3a0b62bc35
---
 res/drawable/private_space_install_app_icon.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/drawable/private_space_install_app_icon.xml b/res/drawable/private_space_install_app_icon.xml
index 4c167ba841..cfec2b126d 100644
--- a/res/drawable/private_space_install_app_icon.xml
+++ b/res/drawable/private_space_install_app_icon.xml
@@ -23,9 +23,9 @@
             android:pathData="M30 0H30A30 30 0 0 1 60 30V30A30 30 0 0 1 30 60H30A30 30 0 0 1 0 30V30A30 30 0 0 1 30 0Z" />
         <path
             android:pathData="M30 0H30A30 30 0 0 1 60 30V30A30 30 0 0 1 30 60H30A30 30 0 0 1 0 30V30A30 30 0 0 1 30 0Z"
-            android:fillColor="@color/material_color_surface_bright" />
+            android:fillColor="@color/material_color_surface_container_lowest" />
         <path
             android:pathData="M29 31h-6v-2h6v-6h2v6h6v2h-6v6h-2v-6Z"
-            android:fillColor="@color/material_color_on_surface_variant" />
+            android:fillColor="@color/material_color_on_surface" />
     </group>
 </vector>

From ae0e957eea75d24bc1c9447105601296688c73e0 Mon Sep 17 00:00:00 2001
From: Brandon Dayauon <brdayauon@google.com>
Date: Mon, 20 May 2024 15:11:42 -0700
Subject: [PATCH 2/2] Update private space divider thickness and padding per
 spec.

Thickness (height) is 2dp.
Padding above and below the divider is 32dp.

bug: 340307977
test manually:
before: https://drive.google.com/file/d/1H364XUILz3gTLOENQL5zQBOELcza7YBk/view?usp=sharing
after: https://drive.google.com/file/d/1HCsnj2s9TwlzIjKL1aHbBqO15nkPoOLj/view?usp=sharing
after vertical padding: https://drive.google.com/file/d/1HS1SFVj9RfvuxHPGyk0PH5dGQum3spqe/view?usp=sharing
Flag: None

Change-Id: I64e9a228e9095449c4ef5f7680d92d234ab96f9f
---
 res/drawable/private_space_app_divider.xml | 2 +-
 res/layout/private_space_divider.xml       | 4 ++--
 res/values/dimens.xml                      | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/drawable/private_space_app_divider.xml b/res/drawable/private_space_app_divider.xml
index 7d069efd8b..1ea12b3328 100644
--- a/res/drawable/private_space_app_divider.xml
+++ b/res/drawable/private_space_app_divider.xml
@@ -17,5 +17,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="?attr/materialColorOutlineVariant"/>
-    <size android:height="1dp" />
+    <size android:height="@dimen/all_apps_divider_height" />
 </shape>
\ No newline at end of file
diff --git a/res/layout/private_space_divider.xml b/res/layout/private_space_divider.xml
index fff862970a..f72e139c6f 100644
--- a/res/layout/private_space_divider.xml
+++ b/res/layout/private_space_divider.xml
@@ -18,8 +18,8 @@
     android:importantForAccessibility="no"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/ps_app_divider_padding"
-    android:paddingRight="@dimen/ps_app_divider_padding"
+    android:paddingHorizontal="@dimen/ps_app_divider_horizontal_padding"
+    android:paddingVertical="@dimen/ps_app_divider_vertical_padding"
     android:src="@drawable/private_space_app_divider"
     android:scaleType="fitXY"
     android:focusable="false" />
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b4f8a475e0..e31a35ff6f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -526,7 +526,8 @@
     <dimen name="ps_button_height">40dp</dimen>
     <dimen name="ps_button_width">40dp</dimen>
     <dimen name="ps_lock_button_width">89dp</dimen>
-    <dimen name="ps_app_divider_padding">16dp</dimen>
+    <dimen name="ps_app_divider_horizontal_padding">16dp</dimen>
+    <dimen name="ps_app_divider_vertical_padding">32dp</dimen>
     <dimen name="ps_extra_bottom_padding">16dp</dimen>
     <dimen name="ps_lock_corner_radius">20dp</dimen>
     <dimen name="ps_lock_icon_size">20dp</dimen>