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

Commit de6450e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AA+ Final UX spec changes" into sc-dev am: bdb06a7d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15270059

Change-Id: Ic4a70896b9d90963b86b535271cec14e0c9363d9
parents a2359041 bdb06a7d

res/drawable/padded_rounded_action_button.xml

+8 −7
Original line number Diff line number Diff line
@@ -16,14 +16,15 @@ 


<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:bottom="8dp" android:top="8dp">

    <item

        android:left="@dimen/padded_rounded_button_padding"

        android:top="@dimen/padded_rounded_button_padding"

        android:right="@dimen/padded_rounded_button_padding"

        android:bottom="@dimen/padded_rounded_button_padding">

        <shape android:shape="rectangle">



            <corners android:radius="@dimen/rounded_button_radius" />

        <stroke android:width="1dp" android:color="?androidprv:attr/colorAccentPrimaryVariant" />

        <padding

            android:left="@dimen/rounded_button_padding"

            android:right="@dimen/rounded_button_padding" />

            <stroke android:width="1dp"

                android:color="?androidprv:attr/colorAccentPrimaryVariant" />

        </shape>

    </item>

</layer-list>

res/layout/work_apps_edu.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


        <Button

            android:layout_width="match_parent"

            android:layout_height="52dp"

            android:layout_height="@dimen/work_card_button_height"

            android:id="@+id/action_btn"

            android:textColor="?attr/workProfileOverlayTextColor"

            android:text="@string/work_profile_edu_accept"

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 
    <dimen name="work_fab_height">56dp</dimen>

    <dimen name="work_fab_radius">28dp</dimen>

    <dimen name="work_card_padding_horizontal">24dp</dimen>

    <dimen name="work_card_button_height">52dp</dimen>

    <dimen name="work_fab_margin">16dp</dimen>

    <dimen name="work_profile_footer_padding">20dp</dimen>

    <dimen name="work_profile_footer_text_size">16sp</dimen>
@@ -333,4 +334,5 @@ 
<!-- Search results related parameters -->

    <dimen name="search_row_icon_size">48dp</dimen>

    <dimen name="search_row_small_icon_size">32dp</dimen>

    <dimen name="padded_rounded_button_padding">8dp</dimen>

</resources>