From 45e0e26971fdd81c0d91e18571ea8e3977fd95bc Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Tue, 25 May 2021 19:21:37 -0500 Subject: [PATCH] [AllApps][Work] Introduce work toggle Fab Screenshot: https://screenshot.googleplex.com/C4r7kKPxv3PKdyN Bug: 186856928 Test: on-device Change-Id: Ifd8ce20fcf2247a6e80537dc7631458e594a8a63 --- 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 | 19 +- .../allapps/AllAppsContainerView.java | 4 +- .../allapps/LauncherAllAppsContainerView.java | 8 - .../launcher3/allapps/WorkModeSwitch.java | 171 ++++--------- .../android/launcher3/views/WorkEduView.java | 230 ------------------ 10 files changed, 124 insertions(+), 446 deletions(-) create mode 100644 res/drawable/work_apps_toggle_background.xml create mode 100644 res/layout/work_mode_fab.xml delete mode 100644 res/layout/work_profile_edu.xml delete 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 new file mode 100644 index 0000000000..a04d269875 --- /dev/null +++ b/res/drawable/work_apps_toggle_background.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + diff --git a/res/layout/work_mode_fab.xml b/res/layout/work_mode_fab.xml new file mode 100644 index 0000000000..21f269fed6 --- /dev/null +++ b/res/layout/work_mode_fab.xml @@ -0,0 +1,33 @@ + + + \ No newline at end of file diff --git a/res/layout/work_mode_switch.xml b/res/layout/work_mode_switch.xml index 31953c72aa..538a180992 100644 --- a/res/layout/work_mode_switch.xml +++ b/res/layout/work_mode_switch.xml @@ -1,5 +1,4 @@ - - - + android:paddingTop="@dimen/work_profile_footer_padding" /> diff --git a/res/layout/work_profile_edu.xml b/res/layout/work_profile_edu.xml deleted file mode 100644 index c3c7010f7e..0000000000 --- a/res/layout/work_profile_edu.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - -