From 4bbed19012798508912db366fb872cd7cf8c3801 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 16 Jan 2020 11:39:31 -0800 Subject: [PATCH] Work profile edu + Move bottom sheet edu resources to launcher3 Bug: 140099753 Test: Manual Change-Id: I933acea2b503c0f98362322d24a067c33a1bb2a7 --- .../hotseat_edu_notification_icon.xml | 2 +- .../res/layout/predicted_hotseat_edu.xml | 17 +- .../res/values/colors.xml | 2 - .../res/values/dimens.xml | 3 - .../hybridhotseat/HotseatEduController.java | 2 +- res/drawable-hdpi/work_tab_user_education.png | Bin 12986 -> 0 bytes res/drawable-mdpi/work_tab_user_education.png | Bin 7088 -> 0 bytes .../work_tab_user_education.png | Bin 20719 -> 0 bytes .../work_tab_user_education.png | Bin 41891 -> 0 bytes .../drawable/bottom_sheet_top_border.xml | 2 +- res/layout/work_profile_edu.xml | 61 +++++ .../work_tab_bottom_user_education_view.xml | 69 ------ res/values/colors.xml | 3 + res/values/dimens.xml | 3 + res/values/strings.xml | 15 +- .../allapps/AllAppsContainerView.java | 16 +- .../views/BottomUserEducationView.java | 149 ------------ .../android/launcher3/views/WorkEduView.java | 216 ++++++++++++++++++ 18 files changed, 314 insertions(+), 246 deletions(-) delete mode 100644 res/drawable-hdpi/work_tab_user_education.png delete mode 100644 res/drawable-mdpi/work_tab_user_education.png delete mode 100644 res/drawable-xhdpi/work_tab_user_education.png delete mode 100644 res/drawable-xxhdpi/work_tab_user_education.png rename quickstep/recents_ui_overrides/res/drawable/hotseat_prediction_edu_top.xml => res/drawable/bottom_sheet_top_border.xml (85%) create mode 100644 res/layout/work_profile_edu.xml delete mode 100644 res/layout/work_tab_bottom_user_education_view.xml delete mode 100644 src/com/android/launcher3/views/BottomUserEducationView.java create mode 100644 src/com/android/launcher3/views/WorkEduView.java diff --git a/quickstep/recents_ui_overrides/res/drawable/hotseat_edu_notification_icon.xml b/quickstep/recents_ui_overrides/res/drawable/hotseat_edu_notification_icon.xml index f0e70a8e8f..fa3a0f856a 100644 --- a/quickstep/recents_ui_overrides/res/drawable/hotseat_edu_notification_icon.xml +++ b/quickstep/recents_ui_overrides/res/drawable/hotseat_edu_notification_icon.xml @@ -15,5 +15,5 @@ --> - + diff --git a/quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml b/quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml index ee38e3b9f4..a7cd167020 100644 --- a/quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml +++ b/quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml @@ -24,12 +24,13 @@ + android:backgroundTint="@color/bottom_panel_background" + android:background="@drawable/bottom_sheet_top_border" /> + android:paddingRight="@dimen/bottom_sheet_edu_padding">