This repository has been archived by the owner on Dec 12, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Sync with latest sources of Evolution X
- Loading branch information
Showing
7 changed files
with
59 additions
and
6 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
.../platform_frameworks_base/0001-Revert-Biometrics-Allow-disabling-of-fingerprint-cle.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 9437c16c1f9edcddc1948b689dd0ba8605cecc30 Mon Sep 17 00:00:00 2001 | ||
From: Alberto Ponces <[email protected]> | ||
Date: Sat, 15 Apr 2023 17:57:46 +0000 | ||
Subject: [PATCH 1/4] Revert "Biometrics: Allow disabling of fingerprint | ||
Subject: [PATCH 1/5] Revert "Biometrics: Allow disabling of fingerprint | ||
cleanups" | ||
|
||
This reverts commit 1a49539bdadbecd9341898c88cd044b8ac14c10f. | ||
|
2 changes: 1 addition & 1 deletion
2
.../platform_frameworks_base/0002-Revert-udfps-Restore-illumination-dot-for-global-hbm.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From 4e2dcfe2c57d2e3c3d569895d9062be1cd158b0c Mon Sep 17 00:00:00 2001 | ||
From: Alberto Ponces <[email protected]> | ||
Date: Wed, 4 Jan 2023 22:57:34 +0000 | ||
Subject: [PATCH 2/4] Revert "udfps: Restore illumination dot for global hbm" | ||
Subject: [PATCH 2/5] Revert "udfps: Restore illumination dot for global hbm" | ||
|
||
This reverts commit 55f0885dcd7cb9b38fe34743fd54be80c1552a3f. | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
.../platform_frameworks_base/0003-Revert-AuthService-Add-support-for-workaround-side-f.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From bb52f437e60127e4c1d47d1ab6e49b43f95ed494 Mon Sep 17 00:00:00 2001 | ||
From: Alberto Ponces <[email protected]> | ||
Date: Mon, 23 Jan 2023 16:35:17 +0000 | ||
Subject: [PATCH 3/4] Revert "AuthService: Add support for workaround side fps | ||
Subject: [PATCH 3/5] Revert "AuthService: Add support for workaround side fps | ||
props" | ||
|
||
This reverts commit b7eb971d693958fde90560db074e3db9d751c9ec. | ||
|
2 changes: 1 addition & 1 deletion
2
.../platform_frameworks_base/0004-Revert-StorageManager-Add-dummy-inCryptKeeperBounce-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
From efddbe0dc2d0a959125aba937a8d85705bb70fb0 Mon Sep 17 00:00:00 2001 | ||
From: Alberto Ponces <[email protected]> | ||
Date: Sun, 20 Nov 2022 20:04:13 +0000 | ||
Subject: [PATCH 4/4] Revert "StorageManager: Add dummy inCryptKeeperBounce method" | ||
Subject: [PATCH 4/5] Revert "StorageManager: Add dummy inCryptKeeperBounce method" | ||
|
||
This reverts commit 787e5e4ef82abc025993c0aded1741e2f25bf49d. | ||
--- | ||
|
53 changes: 53 additions & 0 deletions
53
...requisite/platform_frameworks_base/0005-Revert-KeyguardStatusBarView-Clean-up-cruft.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
From be37c6a7c44b007dbe17523559982b0285a297b6 Mon Sep 17 00:00:00 2001 | ||
From: Alberto Ponces <[email protected]> | ||
Date: Wed, 3 May 2023 19:07:56 +0000 | ||
Subject: [PATCH 5/5] Revert "KeyguardStatusBarView: Clean up cruft" | ||
|
||
This reverts commit 52c776659224e45e00f3316cffaea7ac2a9e23d7. | ||
--- | ||
.../statusbar/phone/KeyguardStatusBarView.java | 15 +++++++++++++++ | ||
1 file changed, 15 insertions(+) | ||
|
||
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java | ||
index 9a048fdaca56..ca55862ae073 100644 | ||
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java | ||
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java | ||
@@ -102,6 +102,7 @@ public class KeyguardStatusBarView extends RelativeLayout { | ||
private int mCutoutSideNudge = 0; | ||
|
||
private DisplayCutout mDisplayCutout; | ||
+ private int mRoundedCornerPadding = 0; | ||
// right and left padding applied to this view to account for cutouts and rounded corners | ||
private Pair<Integer, Integer> mPadding = new Pair(0, 0); | ||
|
||
@@ -168,6 +169,18 @@ public class KeyguardStatusBarView extends RelativeLayout { | ||
mStatusIconContainer.getPaddingBottom() | ||
); | ||
|
||
+ // Respect font size setting. | ||
+ mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, | ||
+ getResources().getDimensionPixelSize( | ||
+ com.android.internal.R.dimen.text_size_small_material)); | ||
+ lp = (MarginLayoutParams) mCarrierLabel.getLayoutParams(); | ||
+ | ||
+ int marginStart = calculateMargin( | ||
+ getResources().getDimensionPixelSize(R.dimen.keyguard_carrier_text_margin), | ||
+ mPadding.first); | ||
+ lp.setMarginStart(marginStart); | ||
+ | ||
+ mCarrierLabel.setLayoutParams(lp); | ||
updateKeyguardStatusBarHeight(); | ||
} | ||
|
||
@@ -191,6 +204,8 @@ public class KeyguardStatusBarView extends RelativeLayout { | ||
R.dimen.ongoing_appops_dot_min_padding); | ||
mCutoutSideNudge = getResources().getDimensionPixelSize( | ||
R.dimen.display_cutout_margin_consumption); | ||
+ mRoundedCornerPadding = res.getDimensionPixelSize( | ||
+ R.dimen.rounded_corner_content_padding); | ||
} | ||
|
||
private void updateVisibilities() { | ||
-- | ||
2.34.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters