Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd3eaa89 authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge changes I64e9a228,I300e8513 into main 

* changes:
  Update private space divider thickness and padding per spec.
  Update install app icon colors to spec:
parents 73fe0b43 ae0e957e

res/drawable/private_space_app_divider.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

res/drawable/private_space_install_app_icon.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

res/layout/private_space_divider.xml

+2 −2
Original line number Diff line number Diff line
@@ -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

res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -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>