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

Commit 13f7b6fd authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Automerger Merge Worker
Browse files

Merge "Edu card spec polish" into sc-dev am: d2182b24 

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

Change-Id: Ia1a0dad6ab859a51b3997309ab0f31bb3ef1c828
parents cd777a3f d2182b24

res/layout/work_apps_edu.xml

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:paddingHorizontal="@dimen/work_card_padding_horizontal"

        android:paddingVertical="@dimen/work_card_padding_vertical"

        android:paddingVertical="@dimen/work_card_padding_horizontal"

        android:background="@drawable/work_card"

        android:layout_gravity="center_horizontal"

        android:gravity="center"
@@ -36,14 +36,14 @@ 
            android:id="@+id/work_apps_paused_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginBottom="@dimen/work_card_padding_vertical"

            android:layout_marginBottom="@dimen/work_card_padding_horizontal"

            android:text="@string/work_profile_edu_work_apps"

            android:textAlignment="center"

            android:textSize="20sp" />



        <Button

            android:layout_width="wrap_content"

            android:layout_height="@dimen/rounded_button_height"

            android:layout_width="match_parent"

            android:layout_height="52dp"

            android:id="@+id/action_btn"

            android:textColor="?attr/workProfileOverlayTextColor"

            android:text="@string/work_profile_edu_accept"

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 
    <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_padding_vertical">32dp</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>