From 6c11cff9fea961c5ddd9bc9d50269e1b08850dde Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Fri, 5 Feb 2021 09:52:25 -0500 Subject: [PATCH] Controls on lockscreen Beginning of a test for displaying controls on the lock screen in a dialog, and triggered from an afforance on the keyguard bottom area. adb shell settings put global controls_lockscreen 1 Bug: 170729566 Test: manual Change-Id: I101840f29b2f917acb822321c48eb9a692142399 --- .../res/drawable/controls_dialog_bg.xml | 21 +++++ .../res/layout/controls_in_dialog.xml | 45 ++++++++++ .../res/layout/keyguard_bottom_area.xml | 11 +++ packages/SystemUI/res/values/colors.xml | 1 + packages/SystemUI/res/values/dimens.xml | 1 + packages/SystemUI/res/values/styles.xml | 13 +++ .../systemui/controls/ui/ControlsDialog.kt | 90 +++++++++++++++++++ .../phone/KeyguardBottomAreaView.java | 84 +++++++++++++++++ .../NotificationPanelViewController.java | 14 ++- .../phone/NotificationPanelViewTest.java | 10 ++- 10 files changed, 287 insertions(+), 3 deletions(-) create mode 100644 packages/SystemUI/res/drawable/controls_dialog_bg.xml create mode 100644 packages/SystemUI/res/layout/controls_in_dialog.xml create mode 100644 packages/SystemUI/src/com/android/systemui/controls/ui/ControlsDialog.kt diff --git a/packages/SystemUI/res/drawable/controls_dialog_bg.xml b/packages/SystemUI/res/drawable/controls_dialog_bg.xml new file mode 100644 index 0000000000000..cb4686dd04a72 --- /dev/null +++ b/packages/SystemUI/res/drawable/controls_dialog_bg.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/packages/SystemUI/res/layout/controls_in_dialog.xml b/packages/SystemUI/res/layout/controls_in_dialog.xml new file mode 100644 index 0000000000000..983999f9a5f8a --- /dev/null +++ b/packages/SystemUI/res/layout/controls_in_dialog.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 04de9784812f3..862076b650b91 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -81,6 +81,17 @@ android:contentDescription="@string/accessibility_phone_button" android:tint="?attr/wallpaperTextColor" /> + + @color/GM2_blue_300 #33000000 @*android:color/black + #AA000000 #F28B82 diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index d92f4ea653904..cd4b8c542cf2d 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1259,6 +1259,7 @@ 100dp + 12dp 17sp @*android:dimen/config_bottomDialogCornerRadius diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 4b04eebfddf06..8a84e3e1c8824 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -662,6 +662,19 @@ @anim/bottomsheet_out + + + +