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

Commit 8b780d85 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Revert "[AllApps][Work] Introduce work toggle Fab"" into sc-dev am: 17ef90b2 

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

Change-Id: I47bd374d48ee1cdbdc69b4cb3504296c7d475396
parents 6247cf8a 17ef90b2

res/drawable/work_apps_toggle_background.xml

deleted100644 → 0
+0 −31
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.

-->

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

    <item android:state_enabled="false">

        <shape android:shape="rectangle">

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

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

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

        </shape>

    </item>

    <item>

        <shape android:shape="rectangle">

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

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

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

        </shape>

    </item>

</selector>

res/layout/work_mode_fab.xml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<?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.

     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.

-->

<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"

    android:layout_height="@dimen/work_fab_height"

    android:layout_width="wrap_content"

    android:gravity="center"

    android:includeFontPadding="false"

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

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

    android:background="@drawable/work_apps_toggle_background"

    android:drawablePadding="16dp"

    android:drawableStart="@drawable/ic_corp_off"

    android:elevation="10dp"

    android:layout_marginBottom="@dimen/work_fab_margin"

    android:layout_marginEnd="@dimen/work_fab_margin"

    android:text="@string/work_apps_pause_btn_text" />
 
 No newline at end of file

res/layout/work_mode_switch.xml

+6 −3
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.
@@ -12,7 +13,8 @@ 
     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:layout_width="match_parent"

    android:layout_height="wrap_content"

    style="@style/PrimaryHeadline"
@@ -33,4 +35,5 @@ 
    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:paddingTop="@dimen/work_profile_footer_padding"

/>

res/layout/work_profile_edu.xml

0 → 100644
+61 −0
Original line number Diff line number Diff line 
<?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.

     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.

-->

<com.android.launcher3.views.WorkEduView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="bottom"

    android:gravity="bottom"

    android:orientation="vertical">



    <View

        android:layout_width="match_parent"

        android:layout_height="32dp"

        android:background="@drawable/bottom_sheet_top_border"

        android:backgroundTint="?attr/eduHalfSheetBGColor" />



    <LinearLayout

        android:id="@+id/view_wrapper"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?attr/eduHalfSheetBGColor"

        android:orientation="vertical"

        android:paddingLeft="@dimen/bottom_sheet_edu_padding"

        android:paddingRight="@dimen/bottom_sheet_edu_padding">



        <TextView

            android:id="@+id/content_text"

            style="@style/TextHeadline"

            android:layout_width="match_parent"

            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"

            android:textSize="20sp" />



        <Button

            android:id="@+id/proceed"

            android:layout_width="wrap_content"

            android:layout_height="48dp"

            android:layout_gravity="end"

            android:background="?android:attr/selectableItemBackground"

            android:gravity="center"

            android:text="@string/work_profile_edu_next"

            android:textAlignment="center"

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

    </LinearLayout>

</com.android.launcher3.views.WorkEduView>
 
 No newline at end of file

res/values/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -116,10 +116,6 @@ 


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



<!-- 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_fab_margin">18dp</dimen>

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

    <dimen name="work_profile_footer_text_size">16sp</dimen>