From fc235903abcae9e88fce5a2e5ddf492df3b1f28c Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 11 Jun 2021 14:05:07 +0000 Subject: [PATCH] Revert "[AllApps][Work] Introduce work toggle Fab" This reverts commit 08cca82ecab9327fce8ca959feaf0f88902d8f37. Reason for revert: broke errorprone build Bug: 190150515 Change-Id: I1d8707392310e745713b8780bdb957299b88a3a6 --- res/drawable/work_apps_toggle_background.xml | 31 --- res/layout/work_mode_fab.xml | 33 --- res/layout/work_mode_switch.xml | 9 +- res/layout/work_profile_edu.xml | 61 +++++ res/values/dimens.xml | 4 - res/values/strings.xml | 13 +- .../allapps/AllAppsContainerView.java | 4 +- .../allapps/LauncherAllAppsContainerView.java | 8 + .../launcher3/allapps/WorkModeSwitch.java | 168 ++++++++++--- .../android/launcher3/views/WorkEduView.java | 230 ++++++++++++++++++ 10 files changed, 443 insertions(+), 118 deletions(-) delete mode 100644 res/drawable/work_apps_toggle_background.xml delete mode 100644 res/layout/work_mode_fab.xml create mode 100644 res/layout/work_profile_edu.xml create mode 100644 src/com/android/launcher3/views/WorkEduView.java diff --git a/res/drawable/work_apps_toggle_background.xml b/res/drawable/work_apps_toggle_background.xml deleted file mode 100644 index a04d269875..0000000000 --- a/res/drawable/work_apps_toggle_background.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml deleted file mode 100644 index 21f269fed6..0000000000 --- a/res/layout/work_mode_fab.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - \ No newline at end of file diff --git a/res/layout/work_mode_switch.xml b/res/layout/work_mode_switch.xml index 538a180992..31953c72aa 100644 --- a/res/layout/work_mode_switch.xml +++ b/res/layout/work_mode_switch.xml @@ -1,4 +1,5 @@ - - + android:paddingTop="@dimen/work_profile_footer_padding" +/> diff --git a/res/layout/work_profile_edu.xml b/res/layout/work_profile_edu.xml new file mode 100644 index 0000000000..c3c7010f7e --- /dev/null +++ b/res/layout/work_profile_edu.xml @@ -0,0 +1,61 @@ + + + + + + + + + +