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

Commit f5a4deb1 authored by Samuel Fufa's avatar Samuel Fufa
Browse files

Hide work apps when work profile is paused 

- hide overlay icon in landscape mode
- don't show edu if user has already seen legacy work profile edu
- make sure personal tab is highlighted when work profile is reinstalled
- always go home after a work profile is added or removed
- add tests for work edu flow

Bug: 150122946
Test: Manual
Change-Id: I8f80ac763acf03ca31a534464f4ddfd84528d329
parent a579ddc9

res/layout/work_apps_paused.xml

+1 −10
Original line number Diff line number Diff line
@@ -15,19 +15,10 @@ 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="?attr/allAppsScrimColor"

    android:padding="8dp"

    android:padding="48dp"

    android:orientation="vertical"

    android:gravity="center">



    <ImageView

        android:id="@+id/icon"

        android:contentDescription="@string/work_apps_paused_title"

        android:layout_width="32dp"

        android:layout_height="32dp"

        android:tint="?attr/workProfileOverlayTextColor"

        android:src="@drawable/ic_corp_off" />



    <TextView

        style="@style/TextHeadline"

        android:textColor="?attr/workProfileOverlayTextColor"

res/layout/work_profile_edu.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="48dp"

            android:layout_marginBottom="48dp"

            android:gravity="center"

            android:text="@string/work_profile_edu_personal_apps"

            android:textAlignment="center"

            android:textColor="@android:color/white"

res/layout/work_tab_footer.xml

+6 −5
Original line number Diff line number Diff line
@@ -19,19 +19,20 @@ 
    android:layout_height="wrap_content"

    android:id="@+id/work_toggle_container"

    android:focusable="true"

    android:paddingBottom="@dimen/all_apps_work_profile_tab_footer_padding_vertical"

    android:orientation="horizontal"

    android:paddingLeft="@dimen/all_apps_work_profile_tab_footer_padding_horizontal"

    android:background="?attr/allAppsScrimColor"

    android:paddingRight="@dimen/all_apps_work_profile_tab_footer_padding_horizontal"

    android:paddingTop="@dimen/all_apps_work_profile_tab_footer_padding_vertical">

    android:paddingBottom="@dimen/all_apps_work_profile_tab_footer_padding"

    android:paddingLeft="@dimen/all_apps_work_profile_tab_footer_padding"

    android:paddingRight="@dimen/all_apps_work_profile_tab_footer_padding"

    android:paddingTop="@dimen/all_apps_work_profile_tab_footer_padding">



    <TextView

        style="@style/PrimaryMediumText"

        android:id="@+id/work_mode_label"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:drawableStart="@drawable/ic_corp"

        android:drawablePadding="3dp"

        android:drawablePadding="16dp"

        android:drawableTint="?attr/workProfileOverlayTextColor"

        android:textColor="?attr/workProfileOverlayTextColor"

        android:layout_height="wrap_content"

res/values/dimens.xml

+1 −2
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ 
    <dimen name="all_apps_tabs_side_padding">12dp</dimen>

    <dimen name="all_apps_divider_height">1dp</dimen>



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

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

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



<!-- Search bar in All Apps -->

    <dimen name="all_apps_header_max_elevation">3dp</dimen>

res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ 
    <style name="DropTargetButton" parent="DropTargetButtonBase" />



    <style name="TextHeadline" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" />

    <style name="PrimaryMediumText" parent="@android:style/TextAppearance.DeviceDefault.Medium"/>



    <style name="TextTitle" parent="@android:style/TextAppearance.DeviceDefault" />