Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5449099 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Ale Nijamkin
Browse files

Fixes bug in user switcher bouncer dropdown 

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
parent 37f4b300

packages/SystemUI/res-keyguard/values/ids.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?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>

packages/SystemUI/src/com/android/keyguard/KeyguardUserSwitcherPopupMenu.java

+7 −4
Original line number Diff line number Diff line
@@ -66,10 +66,13 @@ public class KeyguardUserSwitcherPopupMenu extends ListPopupWindow { 
        listView.setDividerHeight(mContext.getResources().getDimensionPixelSize(

                R.dimen.bouncer_user_switcher_popup_divider_height));



        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) {