diff options
| -rw-r--r-- | packages/SystemUI/res-keyguard/values/ids.xml | 20 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardUserSwitcherPopupMenu.java | 11 |
2 files changed, 27 insertions, 4 deletions
diff --git a/packages/SystemUI/res-keyguard/values/ids.xml b/packages/SystemUI/res-keyguard/values/ids.xml new file mode 100644 index 000000000000..0dff4ffa3866 --- /dev/null +++ b/packages/SystemUI/res-keyguard/values/ids.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (C) 2022 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. + ~ + --> + +<resources> + <item type="id" name="header_footer_views_added_tag_key" /> +</resources> diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUserSwitcherPopupMenu.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUserSwitcherPopupMenu.java index efa5558f5088..b793fd22aed1 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUserSwitcherPopupMenu.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUserSwitcherPopupMenu.java @@ -66,10 +66,13 @@ public class KeyguardUserSwitcherPopupMenu extends ListPopupWindow { listView.setDividerHeight(mContext.getResources().getDimensionPixelSize( R.dimen.bouncer_user_switcher_popup_divider_height)); - int height = mContext.getResources().getDimensionPixelSize( - R.dimen.bouncer_user_switcher_popup_header_height); - listView.addHeaderView(createSpacer(height), null, false); - listView.addFooterView(createSpacer(height), null, false); + if (listView.getTag(R.id.header_footer_views_added_tag_key) == null) { + int height = mContext.getResources().getDimensionPixelSize( + R.dimen.bouncer_user_switcher_popup_header_height); + listView.addHeaderView(createSpacer(height), null, false); + listView.addFooterView(createSpacer(height), null, false); + listView.setTag(R.id.header_footer_views_added_tag_key, new Object()); + } listView.setOnTouchListener((v, ev) -> { if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) { |