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

Commit 1d7a4410 authored by Samuel Fufa's avatar Samuel Fufa Committed by Automerger Merge Worker
Browse files

Merge "Polish changes for work tab" into sc-dev am: 9010e773 

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

Change-Id: Ic3aa2d63e943b41eb65517d2f25154128edb0432
parents f03b1aee 9010e773

res/drawable/work_card.xml

+0 −3
Original line number Diff line number Diff line
@@ -20,8 +20,5 @@ 
    android:shape="rectangle">

    <solid android:color="?androidprv:attr/colorSurface" />

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

    <padding

        android:left="@dimen/work_fab_radius"

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

</shape>

res/layout/work_apps_edu.xml

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:padding="@dimen/work_edu_card_margin"

        android:paddingHorizontal="@dimen/work_card_padding_horizontal"

        android:paddingVertical="@dimen/work_card_padding_vertical"

        android:background="@drawable/work_card"

        android:layout_gravity="center_horizontal"

        android:gravity="center"
@@ -34,8 +35,7 @@ 
            android:id="@+id/work_apps_paused_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:layout_marginBottom="8dp"

            android:layout_marginBottom="@dimen/work_card_padding_vertical"

            android:text="@string/work_profile_edu_work_apps"

            android:textAlignment="center"

            android:textSize="20sp" />

res/layout/work_apps_paused.xml

+5 −3
Original line number Diff line number Diff line
@@ -28,18 +28,18 @@ 
        android:layout_marginTop="40dp"

        android:text="@string/work_apps_paused_title"

        android:textAlignment="center"

        android:textSize="20sp" />

        android:textSize="22sp" />



    <TextView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/work_apps_paused_content"

        android:textColor="?attr/workProfileOverlayTextColor"

        android:textColor="?android:attr/textColorSecondary"

        android:text="@string/work_apps_paused_body"

        android:textAlignment="center"

        android:layout_marginTop="16dp"

        android:layout_marginBottom="24dp"

        android:textSize="16sp" />

        android:textSize="14sp" />



    <Button

        android:layout_width="wrap_content"
@@ -49,5 +49,7 @@ 
        android:text="@string/work_apps_enable_btn_text"

        android:textAlignment="center"

        android:background="@drawable/rounded_action_button"

        android:paddingStart="8dp"

        android:paddingEnd="8dp"

        android:textSize="14sp" />

</com.android.launcher3.allapps.WorkPausedCard>
 
 No newline at end of file

res/layout/work_mode_fab.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    android:textColor="@color/all_apps_tab_text"

    android:textSize="14sp"

    android:background="@drawable/work_apps_toggle_background"

    android:drawablePadding="16dp"

    android:drawablePadding="8dp"

    android:drawableStart="@drawable/ic_corp_off"

    android:layout_marginBottom="@dimen/work_fab_margin"

    android:layout_marginEnd="@dimen/work_fab_margin"

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ 
<!-- Floating action button inside work tab to toggle work profile -->

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

    <dimen name="work_fab_radius">24dp</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>