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

Commit 154ad76f authored by Samuel Fufa's avatar Samuel Fufa
Browse files

Introduce inline education for work profile 

Bug: 186857875
Test: local
Change-Id: I796b04fbb3ffc714a01104107774819d35034f93
parent 2f346b86

res/drawable/work_apps_toggle_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <item>

        <shape android:shape="rectangle">

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

            <solid android:color="?android:attr/colorAccent" />

            <solid android:color="@color/all_apps_tab_bg" />

            <padding android:left="@dimen/work_fab_radius" android:right="@dimen/work_fab_radius" />

        </shape>

    </item>

res/drawable/work_card.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->





<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

    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/drawable/work_card_btn.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->





<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:shape="rectangle">

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

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

    <padding

        android:left="@dimen/work_fab_radius"

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

</shape>

res/layout/work_mode_switch.xml→res/layout/work_apps_edu.xml

+45 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2017 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -12,25 +12,34 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.allapps.WorkModeSwitch xmlns:android="http://schemas.android.com/apk/res/android"



<com.android.launcher3.allapps.WorkEduCard xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="@dimen/work_edu_card_margin"

    android:orientation="vertical"

    android:background="@drawable/work_card"

    android:gravity="center">



    <TextView

        style="@style/PrimaryHeadline"

    android:id="@+id/work_mode_toggle"

    android:drawableStart="@drawable/ic_corp"

    android:drawablePadding="16dp"

    android:drawableTint="?attr/workProfileOverlayTextColor"

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

        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:text="@string/work_profile_edu_work_apps"

        android:textAlignment="center"

        android:textSize="20sp" />



    <Button

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:id="@+id/action_btn"

        android:textColor="?attr/workProfileOverlayTextColor"

    android:layout_alignParentBottom="true"

    android:ellipsize="end"

    android:elevation="10dp"

    android:gravity="start"

    android:lines="1"

    android:showText="false"

    android:textSize="@dimen/work_profile_footer_text_size"

    android:background="?attr/allAppsScrimColor"

    android:text="@string/work_profile_toggle_label"

    android:paddingBottom="@dimen/work_profile_footer_padding"

    android:paddingLeft="@dimen/work_profile_footer_padding"

    android:paddingRight="@dimen/work_profile_footer_padding"

    android:paddingTop="@dimen/work_profile_footer_padding" />
 
        android:text="@string/work_profile_edu_accept"

        android:textAlignment="center"

        android:background="@drawable/work_card_btn"

        android:textSize="14sp" />

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

res/layout/work_mode_fab.xml

+4 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 The Android Open Source Project

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2017 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -13,8 +12,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.allapps.WorkModeSwitch

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

<com.android.launcher3.allapps.WorkModeSwitch xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/work_mode_toggle"

    android:layout_alignParentBottom="true"

    android:layout_alignParentEnd="true"
@@ -22,8 +20,8 @@ 
    android:layout_width="wrap_content"

    android:gravity="center"

    android:includeFontPadding="false"

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

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

    android:drawableTint="@color/all_apps_tab_text"

    android:textColor="@color/all_apps_tab_text"

    android:background="@drawable/work_apps_toggle_background"

    android:drawablePadding="16dp"

    android:drawableStart="@drawable/ic_corp_off"