Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes bug in user switcher bouncer dropdown

Browse Source 
The bug was caused by the blind readding of header and footer views to
the ListView that backs the dropdown popup menu. The bug pre-existed the
refactoring work but was hidden because there were fewer updates being
sent to the UI.

The bug means that, if the bouncer dropdown is opened quickly after a
user switch event, the dropdown will visually have larger gaps above and
below its items.

The fix is simply to check whether we've already added a header and
footer to the list view before adding them again.

Bug: 246631653
Test: the bug no longer occurs after the fix
Change-Id: I58d307d79a0c7804636f145df22fe3e8f8e134fe
This commit is contained in:
Alejandro Nijamkin
2022-10-03 14:24:13 -07:00
committed by Ale Nijamkin
parent 37f4b300c6
commit d544909970
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/res-keyguard/values/ids.xml Normal file
View File

@@ -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>

11
packages/SystemUI/src/com/android/keyguard/KeyguardUserSwitcherPopupMenu.java
View File

@@ -66,10 +66,13 @@ public class KeyguardUserSwitcherPopupMenu extends ListPopupWindow {
listView.setDividerHeight(mContext.getResources().getDimensionPixelSize( listView.setDividerHeight(mContext.getResources().getDimensionPixelSize(
R.dimen.bouncer_user_switcher_popup_divider_height)); R.dimen.bouncer_user_switcher_popup_divider_height));
int height = mContext.getResources().getDimensionPixelSize( if (listView.getTag(R.id.header_footer_views_added_tag_key) == null) {
R.dimen.bouncer_user_switcher_popup_header_height); int height = mContext.getResources().getDimensionPixelSize(
listView.addHeaderView(createSpacer(height), null, false); R.dimen.bouncer_user_switcher_popup_header_height);
listView.addFooterView(createSpacer(height), null, false); 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) -> { listView.setOnTouchListener((v, ev) -> {
if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) { if (ev.getActionMasked() == MotionEvent.ACTION_DOWN) {