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

Commit 310f6c7f authored by Alejandro Nijamkin's avatar Alejandro Nijamkin Committed by Automerger Merge Worker
Browse files

Fixes bug in user switcher bouncer dropdown am: d5449099 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20104924



Change-Id: Ife4d5dc14ab8057dd0c05b247e29ad032ec3c978
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 106f0849 d5449099

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