diff options
| author | Austin Wang <wangaustin@google.com> | 2021-04-22 17:27:30 +0800 |
|---|---|---|
| committer | Austin Wang <wangaustin@google.com> | 2021-05-03 10:20:13 +0000 |
| commit | 56bdf23de8b8e55dad19331d00a4f57130780eb5 (patch) | |
| tree | 45d6032cf36cf181897d71521b5aeafa5a1c0478 | |
| parent | d8e7c1433dacf9ac82b6743a496a3524144be2b5 (diff) | |
Add dock_info_bottom_area_overlay
Add and overlay near keyguard_bottom_are to host the promo animation.
Bug: 182220090
Bug: 178998477
Test: atest SystemUITests:KeyguardBottomAreaTest
Test: atestSystemUITests:DockIndicationControllerTest
Change-Id: I93a3ddee3f4dc3273ba446dab6f9df49c262e955
3 files changed, 27 insertions, 2 deletions
diff --git a/packages/SystemUI/res/layout/dock_info_bottom_area_overlay.xml b/packages/SystemUI/res/layout/dock_info_bottom_area_overlay.xml new file mode 100644 index 000000000000..8b70dd782407 --- /dev/null +++ b/packages/SystemUI/res/layout/dock_info_bottom_area_overlay.xml @@ -0,0 +1,19 @@ +<?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. + --> + +<!-- empty stub --> +<merge /> diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 46a698a092e3..496813d7c333 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -101,6 +101,8 @@ </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer> + <include layout="@layout/dock_info_bottom_area_overlay" /> + <include layout="@layout/keyguard_bottom_area" android:visibility="gone" /> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java index c1eaaaf92d52..539f36b37c08 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java @@ -492,8 +492,12 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal return UserHandle.USER_NULL; } - @VisibleForTesting - protected void setVisible(boolean visible) { + /** + * Sets the visibility of keyguard bottom area, and if the indications are updatable. + * + * @param visible true to make the area visible and update the indication, false otherwise. + */ + public void setVisible(boolean visible) { mVisible = visible; mIndicationArea.setVisibility(visible ? VISIBLE : GONE); if (visible) { |
