Merge changes I64e9a228,I300e8513 into main

* changes:
  Update private space divider thickness and padding per spec.
  Update install app icon colors to spec:
This commit is contained in:
Brandon Dayauon
2024-05-22 21:22:00 +00:00
committed by Android (Google) Code Review
4 changed files with 7 additions and 6 deletions

View File

@@ -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>

View File

@@ -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>

View File

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

View File

@@ -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>