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

Merge "Fix double counting of margins in keygaurd status bar view" into tm-dev am: 9406ddaa7e am: 039e27fc8e

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

Change-Id: I462d4955554cc989f59dccc3762c9796a6ddef4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Laird
2022-04-20 14:58:57 +00:00
committed by Automerger Merge Worker
parent ea14c3eeac 039e27fc8e
commit 7c87a4ea09
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
View File

@@ -233,9 +233,6 @@ public class KeyguardStatusBarView extends RelativeLayout {
LinearLayout.LayoutParams lp =
(LinearLayout.LayoutParams) mSystemIconsContainer.getLayoutParams();
int marginStart = getResources().getDimensionPixelSize(
R.dimen.system_icons_super_container_margin_start);
// Use status_bar_padding_end to replace original
// system_icons_super_container_avatarless_margin_end to prevent different end alignment
// between PhoneStatusBarView and KeyguardStatusBarView
@@ -248,8 +245,7 @@ public class KeyguardStatusBarView extends RelativeLayout {
// 1. status bar layout: mPadding(consider round_corner + privacy dot)
// 2. icon container: R.dimen.status_bar_padding_end
if (marginEnd != lp.getMarginEnd() || marginStart != lp.getMarginStart()) {
lp.setMarginStart(marginStart);
if (marginEnd != lp.getMarginEnd()) {
lp.setMarginEnd(marginEnd);
mSystemIconsContainer.setLayoutParams(lp);
}