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

Merge "Fixes bug in user switcher bouncer dropdown am: d544909970 am: 310f6c7f36"

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-10-05 02:16:42 +00:00
committed by Android (Google) Code Review
parent ceee53dc36 dd73c737a1
commit a076aec93f
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(
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) {