nehemiah-zb/lineage_patches_unified
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes for February 2022, syncing up to v402

Browse Source
This commit is contained in:
Andy CrossGate Yan 2022-02-12 13:14:08 +00:00
parent d4c58201c8
commit f16874a663
124 changed files with 1330 additions and 964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch
View File

@ -1,7 +1,7 @@
From e37d16ac9d6d84412f64243dee1c48d8b1eb6ed5 Mon Sep 17 00:00:00 2001 From 9644e048f2a52b51195003bb90a45c3a0efb67c8 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 13 Jan 2022 14:22:24 +0000 Date: Thu, 13 Jan 2022 14:22:24 +0000
Subject: [PATCH 01/21] Add SPenPointerOverlay Subject: [PATCH 01/19] Add SPenPointerOverlay
Toggle this overlay with property "persist.ui.spen.pointer" Toggle this overlay with property "persist.ui.spen.pointer"
@ -114,7 +114,7 @@ HcmV?d00001
diff --git a/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml b/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml diff --git a/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml b/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml
new file mode 100644 new file mode 100644
index 000000000000..6db08716fc62 index 000000000000..f35255c5f961
--- /dev/null --- /dev/null
+++ b/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml +++ b/packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@

4
patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch
View File

@ -1,7 +1,7 @@
From 6379c3431defb061fbc793982c1ba88b9d475e99 Mon Sep 17 00:00:00 2001 From 160ca5e73a2d075c5514db911180d4523fedf860 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 5 Apr 2018 10:01:19 +0800 Date: Thu, 5 Apr 2018 10:01:19 +0800
Subject: [PATCH 02/21] Disable vendor mismatch warning Subject: [PATCH 02/19] Disable vendor mismatch warning
Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b
--- ---

6
patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch
View File

@ -1,7 +1,7 @@
From f7b8284284e3eb360a2403fc6782ccfff96bb99b Mon Sep 17 00:00:00 2001 From 79e4311950c147ce85983a7088f4d921050f3f74 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 16 Oct 2021 02:23:48 +0000 Date: Sat, 16 Oct 2021 02:23:48 +0000
Subject: [PATCH 03/21] UI: Adjust default navbar layouts Subject: [PATCH 03/19] UI: Adjust default navbar layouts
- Slightly tighten nodpi layout - Slightly tighten nodpi layout
- Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify
@ -45,7 +45,7 @@ index 07b797a32428..000000000000
- <string name="config_navBarLayout" translatable="false">left[.25W],back[.5WC];home;recent[.5WC],right[.25W]</string> - <string name="config_navBarLayout" translatable="false">left[.25W],back[.5WC];home;recent[.5WC],right[.25W]</string>
-</resources> -</resources>
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index d0098b32f384..62e4e27dca2a 100644 index ebf7b8407727..557699b35aa8 100644
--- a/packages/SystemUI/res/values/config.xml --- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml
@@ -350,7 +350,7 @@ @@ -350,7 +350,7 @@

4
patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch
View File

@ -1,7 +1,7 @@
From b6ee471eb9405c82d26fc2cddc4c1446fa872467 Mon Sep 17 00:00:00 2001 From 47b42ba04a71792b6a0d9bcfa6fe515593d4bcc8 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Fri, 9 Mar 2018 15:41:26 +0800 Date: Fri, 9 Mar 2018 15:41:26 +0800
Subject: [PATCH 04/21] UI: Disable left (seascape) navigation bar optionally Subject: [PATCH 04/19] UI: Disable left (seascape) navigation bar optionally
Toggle this behaviour with property "persist.ui.seascape.disable" Toggle this behaviour with property "persist.ui.seascape.disable"

4
patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch
View File

@ -1,7 +1,7 @@
From a8f18ce03f513f63f98c14b89918011e8e30ca93 Mon Sep 17 00:00:00 2001 From 66956ebbdb5645ff2cfb2a010d4371faa7c41554 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 10 Jan 2021 11:44:29 +0000 Date: Sun, 10 Jan 2021 11:44:29 +0000
Subject: [PATCH 05/21] UI: Disable wallpaper zoom Subject: [PATCH 05/19] UI: Disable wallpaper zoom
It does little more than inducing motion sickness It does little more than inducing motion sickness

4
patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch
View File

@ -1,7 +1,7 @@
From b2a7f77623b07fbea767605ba8ad5bbe6ed94c70 Mon Sep 17 00:00:00 2001 From 04b13419bb9446b5b25fe329be88804e297050b2 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 3 Jun 2020 01:31:34 +0000 Date: Wed, 3 Jun 2020 01:31:34 +0000
Subject: [PATCH 06/21] UI: Increase default status bar height Subject: [PATCH 06/19] UI: Increase default status bar height
Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07
--- ---

4
patches_platform/frameworks_base/0007-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch
View File

@ -1,7 +1,7 @@
From a77071568a33266c3f93db359d865eddd2b38313 Mon Sep 17 00:00:00 2001 From 65e25646ab0c3cbfdc7199a791cd5e8bcccbaffe Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 6 Oct 2020 01:41:16 +0000 Date: Tue, 6 Oct 2020 01:41:16 +0000
Subject: [PATCH 07/21] UI: Revive navbar layout tuning via sysui_nav_bar Subject: [PATCH 07/19] UI: Revive navbar layout tuning via sysui_nav_bar
tunable tunable
Google keeps fixing what ain't broken. Google keeps fixing what ain't broken.

4
patches_platform/frameworks_base/0008-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch
View File

@ -1,7 +1,7 @@
From 064121d33cea08c574f5bd80b10bd3b3721241cc Mon Sep 17 00:00:00 2001 From e2774d80fc6cd0de872259c555f21ae2e8f8bf2c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 26 Apr 2020 08:56:13 +0000 Date: Sun, 26 Apr 2020 08:56:13 +0000
Subject: [PATCH 08/21] UI: Use SNAP_FIXED_RATIO for multi-window globally Subject: [PATCH 08/19] UI: Use SNAP_FIXED_RATIO for multi-window globally
Enables multiple snap targets under landscape for phone UI Enables multiple snap targets under landscape for phone UI

4
patches_platform/frameworks_base/0009-UI-Unblock-alarm-status-bar-icon.patch
View File

@ -1,7 +1,7 @@
From 2e11990cb2b10f0fe3c87273d76b3875da3b2e8f Mon Sep 17 00:00:00 2001 From 5bfabfbe5d9b44e85f18151fa1f29ed59b505dd5 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 14 Oct 2021 15:45:24 +0000 Date: Thu, 14 Oct 2021 15:45:24 +0000
Subject: [PATCH 09/21] UI: Unblock alarm status bar icon Subject: [PATCH 09/19] UI: Unblock alarm status bar icon
That's very Zen of you, Google... That's very Zen of you, Google...

4
patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch
View File

@ -1,7 +1,7 @@
From 4247002faaf6768550040aec3132ca2015c6543c Mon Sep 17 00:00:00 2001 From 262b65f0ca1c307215c538c378775874c054ef01 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 3 Nov 2020 22:43:12 -0800 Date: Tue, 3 Nov 2020 22:43:12 -0800
Subject: [PATCH 10/21] core: Remove old app target SDK dialog Subject: [PATCH 10/19] core: Remove old app target SDK dialog
If an app is old, users should already know that, and there's usually no If an app is old, users should already know that, and there's usually no
point in warning them about it because they would already be using a point in warning them about it because they would already be using a

6
patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch
View File

@ -1,7 +1,7 @@
From 5403541355fe9d511591a10850d4e141f038a30b Mon Sep 17 00:00:00 2001 From 69866119d54b6e5aee80530f4030980ef0ab28c1 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 5 Oct 2021 21:01:15 -0700 Date: Tue, 5 Oct 2021 21:01:15 -0700
Subject: [PATCH 11/21] SystemUI: Always refresh power menu on UI mode change Subject: [PATCH 11/19] SystemUI: Always refresh power menu on UI mode change
This is necessary for reliably theming the global actions dialog with This is necessary for reliably theming the global actions dialog with
dynamic colors and adapting it to light/dark themes. dynamic colors and adapting it to light/dark themes.
@ -15,7 +15,7 @@ Change-Id: Id6f6623096ed231e841ca3794b47f8a0ab54dae6
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
index 65c520ef2ff4..43a1084540f6 100644 index 11da4f5ca39e..afe2629fd53d 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java
@@ -762,7 +762,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene @@ -762,7 +762,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene

4
patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch
View File

@ -1,7 +1,7 @@
From 19c047cf3be7c3bcd1254c0b62fa3e9d5d0ae733 Mon Sep 17 00:00:00 2001 From a08e7b27c44c384da58a118f5a0f3290a37f07da Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Sat, 9 Oct 2021 14:39:38 -0700 Date: Sat, 9 Oct 2021 14:39:38 -0700
Subject: [PATCH 12/21] SystemUI: Use Monet colors for power menu Subject: [PATCH 12/19] SystemUI: Use Monet colors for power menu
It's odd that the power menu doesn't use Monet colors, unlike most of It's odd that the power menu doesn't use Monet colors, unlike most of
System UI. This makes it feel more integrated with the rest of the System UI. This makes it feel more integrated with the rest of the

4
patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch
View File

@ -1,7 +1,7 @@
From a3d2feb6e711e9a96cec4fa19276be18bdda118c Mon Sep 17 00:00:00 2001 From 09ea8e6106959f6c8a6399227ee029d1feace6b2 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Wed, 6 Oct 2021 18:40:30 -0700 Date: Wed, 6 Oct 2021 18:40:30 -0700
Subject: [PATCH 13/21] Revert "Make QS always use dark theme colors" Subject: [PATCH 13/19] Revert "Make QS always use dark theme colors"
This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5. This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5.

4
patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch
View File

@ -1,7 +1,7 @@
From aadd3892d31154fd43307f3ac1293b9a1ed011b6 Mon Sep 17 00:00:00 2001 From 9bce4fe471a1d7c107fad69b9285525041feed72 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Wed, 6 Oct 2021 18:41:11 -0700 Date: Wed, 6 Oct 2021 18:41:11 -0700
Subject: [PATCH 14/21] Revert "Do not re-inflate QS and SB when Subject: [PATCH 14/19] Revert "Do not re-inflate QS and SB when
CONFIG_UI_MODE" CONFIG_UI_MODE"
This reverts commit 8a40ff855b86bc86e23367017002289920855a4e. This reverts commit 8a40ff855b86bc86e23367017002289920855a4e.

8
patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch
View File

@ -1,7 +1,7 @@
From a9bd8968c9baae389fd4e5cc54d2c4403d603690 Mon Sep 17 00:00:00 2001 From c87db4a6ea8c4c399dd92923dd28f2533246c293 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 19:24:58 -0700 Date: Mon, 11 Oct 2021 19:24:58 -0700
Subject: [PATCH 15/21] SystemUI: Follow light/dark theme in quick settings Subject: [PATCH 15/19] SystemUI: Follow light/dark theme in quick settings
Android 12's dual-tone style where the quick settings panel is always Android 12's dual-tone style where the quick settings panel is always
dark makes the light theme look like a second-class citizen. Pure black dark makes the light theme look like a second-class citizen. Pure black
@ -82,7 +82,7 @@ index 860d23b11439..8f12b95ed4f6 100644
</shape> </shape>
</item> </item>
diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml
index ffcc3a821d36..a9fa9f3f9fde 100644 index dd999837a1ba..3fd6f9cc5454 100644
--- a/packages/SystemUI/res/values-night/styles.xml --- a/packages/SystemUI/res/values-night/styles.xml
+++ b/packages/SystemUI/res/values-night/styles.xml +++ b/packages/SystemUI/res/values-night/styles.xml
@@ -24,6 +24,18 @@ @@ -24,6 +24,18 @@
@ -102,7 +102,7 @@ index ffcc3a821d36..a9fa9f3f9fde 100644
+ </style> + </style>
+ +
<style name="TextAppearance.QS.Status" parent="TextAppearance.QS.TileLabel.Secondary"> <style name="TextAppearance.QS.Status" parent="TextAppearance.QS.TileLabel.Secondary">
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item> <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index e592fe2dd630..a5ed039bd3fd 100644 index e592fe2dd630..a5ed039bd3fd 100644

4
patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch
View File

@ -1,7 +1,7 @@
From 18493a29e0c14b70e112e2e4f9ced0eca413bad7 Mon Sep 17 00:00:00 2001 From 57277759d1f5aa1d81f2121bc4d69edfed807cea Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 19:25:02 -0700 Date: Mon, 11 Oct 2021 19:25:02 -0700
Subject: [PATCH 16/21] SystemUI: Initialize QS tiles in inactive state Subject: [PATCH 16/19] SystemUI: Initialize QS tiles in inactive state
Now that the QS fragment is recreated when changing the UI mode (so that Now that the QS fragment is recreated when changing the UI mode (so that
it follows light/dark themes), all tiles flash with active color briefly it follows light/dark themes), all tiles flash with active color briefly

4
patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch
View File

@ -1,7 +1,7 @@
From 2d092c73ebc947960e09ba5a1a1a884224206c4b Mon Sep 17 00:00:00 2001 From d8e58fc80da5875d4a909d349413a4308a35a272 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 19:25:08 -0700 Date: Mon, 11 Oct 2021 19:25:08 -0700
Subject: [PATCH 17/21] SystemUI: Add dual-tone light and dark themes for QS Subject: [PATCH 17/19] SystemUI: Add dual-tone light and dark themes for QS
Google's dual-tone QS design where the notification panel has a Google's dual-tone QS design where the notification panel has a
semantically higher elevation adds depth to the notification+QS shade, semantically higher elevation adds depth to the notification+QS shade,

4
patches_platform/frameworks_base/0019-Paint-Enable-subpixel-text-positioning-by-default.patch → patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch
View File

@ -1,7 +1,7 @@
From 51ff74ab5ef8bc65f6bb3d6d436995bcbe7b8d89 Mon Sep 17 00:00:00 2001 From 3606dbe992a728d9e348d1d1802c189cc6a393f7 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 5 Oct 2021 21:01:50 -0700 Date: Tue, 5 Oct 2021 21:01:50 -0700
Subject: [PATCH 19/21] Paint: Enable subpixel text positioning by default Subject: [PATCH 18/19] Paint: Enable subpixel text positioning by default
On desktop Linux, subpixel text positioning is necessary to avoid On desktop Linux, subpixel text positioning is necessary to avoid
kerning issues, and Android is no different. Even though most phone kerning issues, and Android is no different. Even though most phone

48
patches_platform/frameworks_base/0018-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch
View File

@ -1,48 +0,0 @@
From e9e767ef589530c378b9233ae3d3c5aa37f500ec Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 19:25:11 -0700
Subject: [PATCH 18/21] SystemUI: Remove nav bar background in QS customizer
This looks outdated, since most apps are edge-to-edge nowadays.
Change-Id: I8c54e61e618a9b5bed1a59753ce76e8fbd69fae2
---
packages/SystemUI/res/layout/qs_customize_panel_content.xml | 6 ------
.../src/com/android/systemui/qs/customize/QSCustomizer.java | 4 ----
2 files changed, 10 deletions(-)
diff --git a/packages/SystemUI/res/layout/qs_customize_panel_content.xml b/packages/SystemUI/res/layout/qs_customize_panel_content.xml
index 8ca1b8e85634..5f96dacba80e 100644
--- a/packages/SystemUI/res/layout/qs_customize_panel_content.xml
+++ b/packages/SystemUI/res/layout/qs_customize_panel_content.xml
@@ -56,10 +56,4 @@
android:importantForAccessibility="auto" />
</com.android.keyguard.AlphaOptimizedLinearLayout>
- <View
- android:id="@+id/nav_bar_background"
- android:layout_width="match_parent"
- android:layout_height="@dimen/navigation_bar_size"
- android:layout_gravity="bottom"
- android:background="#ff000000" />
</merge>
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
index 7518b200c7e2..20359b64e4cb 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
@@ -90,12 +90,8 @@ public class QSCustomizer extends LinearLayout {
}
void updateNavBackDrop(Configuration newConfig, LightBarController lightBarController) {
- View navBackdrop = findViewById(R.id.nav_bar_background);
mIsShowingNavBackdrop = newConfig.smallestScreenWidthDp >= 600
|| newConfig.orientation != Configuration.ORIENTATION_LANDSCAPE;
- if (navBackdrop != null) {
- navBackdrop.setVisibility(mIsShowingNavBackdrop ? View.VISIBLE : View.GONE);
- }
updateNavColors(lightBarController);
}
--
2.25.1

4
patches_platform/frameworks_base/0021-Fix-QS-clock-being-white-on-light-theme.patch → patches_platform/frameworks_base/0019-Fix-QS-clock-being-white-on-light-theme.patch
View File

@ -1,7 +1,7 @@
From d219b7a9aefd4a744e66ea331dc5ac127c9b3ab3 Mon Sep 17 00:00:00 2001 From e6bb7fa0f413c0f68bd021bca26fac6a060e52b1 Mon Sep 17 00:00:00 2001
From: SagarMakhar <sagarmakhar@gmail.com> From: SagarMakhar <sagarmakhar@gmail.com>
Date: Sat, 6 Nov 2021 13:16:24 +0000 Date: Sat, 6 Nov 2021 13:16:24 +0000
Subject: [PATCH 21/21] Fix QS clock being white on light theme Subject: [PATCH 19/19] Fix QS clock being white on light theme
Steps to reproduce without this commit: Steps to reproduce without this commit:
- Turn off dark theme - Turn off dark theme

30
patches_platform/frameworks_base/0020-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch
View File

@ -1,30 +0,0 @@
From 4cafce4750d1834d48d806623d84f9625c0ba3a9 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 5 Oct 2021 21:02:12 -0700
Subject: [PATCH 20/21] SystemUI: Fix QS status font weight mismatch in dark
mode
Text in the QS status bar is medium in light mode and regular in dark
mode. Fix the mismatch.
Change-Id: Ic6e5dc547d4ded9d231f88f6cac3e1e9f8483d5e
---
packages/SystemUI/res/values-night/styles.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml
index a9fa9f3f9fde..3fd6f9cc5454 100644
--- a/packages/SystemUI/res/values-night/styles.xml
+++ b/packages/SystemUI/res/values-night/styles.xml
@@ -37,7 +37,7 @@
</style>
<style name="TextAppearance.QS.Status" parent="TextAppearance.QS.TileLabel.Secondary">
- <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
--
2.25.1

14
patches_platform/packages_apps_LineageParts/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch
View File

@ -1,4 +1,4 @@
From 9fd08fb7ecb602afd3a5f1f19ccc1b20d1cbbe9c Mon Sep 17 00:00:00 2001 From 10a8d7cb2306f928abc91fbeb24f3b6fc6aa9057 Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com> From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Sun, 13 Jan 2019 21:44:48 +0800 Date: Sun, 13 Jan 2019 21:44:48 +0800
Subject: [PATCH] LineageParts: Invert per-app stretch-to-fullscreen Subject: [PATCH] LineageParts: Invert per-app stretch-to-fullscreen
@ -44,11 +44,11 @@ index 37d129d..97600b8 100644
<string name="charging_sounds_enable_title">启用充电提示音</string> <string name="charging_sounds_enable_title">启用充电提示音</string>
<string name="charging_sounds_summary">连接或断开电源时发出声音</string> <string name="charging_sounds_summary">连接或断开电源时发出声音</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8421fce..b9f140a 100644 index efb9fbf..dda3125 100644
--- a/res/values/strings.xml --- a/res/values/strings.xml
+++ b/res/values/strings.xml +++ b/res/values/strings.xml
@@ -575,9 +575,9 @@ @@ -563,9 +563,9 @@
<string name="auto_power_save_never">Never</string> <string name="display_rotation_270_title">270 degrees</string>
<!-- Applications: Long screen --> <!-- Applications: Long screen -->
- <string name="long_screen_settings_title">Full screen apps</string> - <string name="long_screen_settings_title">Full screen apps</string>
@ -73,11 +73,11 @@ index ec947fa..20da90a 100644
</PreferenceScreen> </PreferenceScreen>
diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
index 2d8dca7..1e6ace4 100644 index 803b214..6f61e9d 100644
--- a/res/xml/parts_catalog.xml --- a/res/xml/parts_catalog.xml
+++ b/res/xml/parts_catalog.xml +++ b/res/xml/parts_catalog.xml
@@ -87,8 +87,8 @@ @@ -81,8 +81,8 @@
lineage:xmlRes="@xml/perf_profile_settings" /> lineage:xmlRes="@xml/power_menu_settings" />
<part android:key="long_screen_settings" <part android:key="long_screen_settings"
- android:title="@string/long_screen_settings_title" - android:title="@string/long_screen_settings_title"

36
patches_platform/packages_apps_LineageParts/9999-TEMP-LineageParts-Fix-DisplayColor-dialog.patch
View File

@ -1,36 +0,0 @@
From 5786216ada9a7351acf816b126df7f428f80128b Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 13 Jan 2022 02:24:07 +0000
Subject: [PATCH] [TEMP] LineageParts: Fix DisplayColor dialog
Change-Id: I5cc300037286d34f03f511d935d26361b029817a
---
.../lineageparts/livedisplay/DisplayColor.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/org/lineageos/lineageparts/livedisplay/DisplayColor.java b/src/org/lineageos/lineageparts/livedisplay/DisplayColor.java
index a000ba9..334055a 100644
--- a/src/org/lineageos/lineageparts/livedisplay/DisplayColor.java
+++ b/src/org/lineageos/lineageparts/livedisplay/DisplayColor.java
@@ -79,6 +79,18 @@ public class DisplayColor extends CustomDialogPreference<AlertDialog> {
public void onClick(DialogInterface dialog, int which) {
}
});
+ builder.setNegativeButton(R.string.cancel,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ }
+ });
+ builder.setPositiveButton(R.string.dlg_ok,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ }
+ });
}
@Override
--
2.25.1

22
patches_platform/vendor_partner_gms/0001-SearchLauncher-Adapt-to-Trebuchet.patch
View File

@ -1,12 +1,13 @@
From c4eac79c4f34e34e793f19e50d97a74daa05ec69 Mon Sep 17 00:00:00 2001 From facde4b2b88c2ced8092714df21c4e09751ca1da Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 30 Nov 2021 12:58:00 +0000 Date: Tue, 30 Nov 2021 12:58:00 +0000
Subject: [PATCH] SearchLauncher: Adapt to Trebuchet Subject: [PATCH] SearchLauncher: Adapt to Trebuchet
--- ---
apps/SearchLauncher/Android.mk | 4 ++-- apps/SearchLauncher/Android.mk | 4 ++--
apps/SearchLauncher/AndroidManifest.xml | 3 ++- apps/SearchLauncher/AndroidManifest.xml | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-) .../quickstep/res/layout/search_container_all_apps.xml | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/apps/SearchLauncher/Android.mk b/apps/SearchLauncher/Android.mk diff --git a/apps/SearchLauncher/Android.mk b/apps/SearchLauncher/Android.mk
index a9f182a..6b90364 100644 index a9f182a..6b90364 100644
@ -44,6 +45,19 @@ index d5ffded..a9b5597 100644
<activity <activity
android:name="com.android.searchlauncher.SearchLauncher" android:name="com.android.searchlauncher.SearchLauncher"
diff --git a/apps/SearchLauncher/quickstep/res/layout/search_container_all_apps.xml b/apps/SearchLauncher/quickstep/res/layout/search_container_all_apps.xml
index 1fae132..82ccf38 100644
--- a/apps/SearchLauncher/quickstep/res/layout/search_container_all_apps.xml
+++ b/apps/SearchLauncher/quickstep/res/layout/search_container_all_apps.xml
@@ -47,7 +47,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="?android:attr/textColorSecondary"
- android:textColorHint="@drawable/all_apps_search_hint"
+ android:textColorHint="?android:attr/textColorSecondary"
android:textSize="16sp"
android:visibility="invisible" />
</com.android.searchlauncher.HotseatQsbWidget>
-- --
2.25.1 2.25.1

2
patches_platform_personal/frameworks_base/0001-Add-LineageMonetAccentOverlay.patch
View File

@ -1,4 +1,4 @@
From d72fc12143501bfa376db5fd888b9115e0c279e7 Mon Sep 17 00:00:00 2001 From 5598980edbd93751dc3c006d9d88b1b0e70170cc Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 27 Oct 2021 14:38:37 +0000 Date: Wed, 27 Oct 2021 14:38:37 +0000
Subject: [PATCH 01/16] Add LineageMonetAccentOverlay Subject: [PATCH 01/16] Add LineageMonetAccentOverlay

2
patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch
View File

@ -1,4 +1,4 @@
From 9b99205d455b3628d4ab017c77649e116fff182a Mon Sep 17 00:00:00 2001 From d8f26074114f9bb4e9a57ece4cb39d42e0ffa90c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 20 Jun 2021 03:39:32 +0000 Date: Sun, 20 Jun 2021 03:39:32 +0000
Subject: [PATCH 02/16] Add MiuiNavbarOverlay Subject: [PATCH 02/16] Add MiuiNavbarOverlay

2
patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch
View File

@ -1,4 +1,4 @@
From a18c07c4fa6a3a3e776b40b13c1e666958fa0549 Mon Sep 17 00:00:00 2001 From 2b7f5a1ca1c43ae5d7af48eeb07afa08f581e49b Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 27 Sep 2021 16:30:00 +0000 Date: Mon, 27 Sep 2021 16:30:00 +0000
Subject: [PATCH 03/16] Disable cursor drag by default for editable TextViews Subject: [PATCH 03/16] Disable cursor drag by default for editable TextViews

2
patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch
View File

@ -1,4 +1,4 @@
From 6b4d66980ecb2a61e959bf256ae3f72ec448945e Mon Sep 17 00:00:00 2001 From 26f39b897540abbdc64f25f671de87b9df33c04d Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com> From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Fri, 22 Mar 2019 00:41:20 +0800 Date: Fri, 22 Mar 2019 00:41:20 +0800
Subject: [PATCH 04/16] Disable FP lockouts Subject: [PATCH 04/16] Disable FP lockouts

2
patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch
View File

@ -1,4 +1,4 @@
From 80f4784fd42852d15b2bf815e8f068bc5c4977dd Mon Sep 17 00:00:00 2001 From 1da3b1d0155f06373057ee7b08691da664e94da8 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 2 Sep 2021 16:15:19 +0000 Date: Thu, 2 Sep 2021 16:15:19 +0000
Subject: [PATCH 05/16] Keyguard: Adjust clock style Subject: [PATCH 05/16] Keyguard: Adjust clock style

2
patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch
View File

@ -1,4 +1,4 @@
From cd9ff5604ed0420eb6e4317370a22293a40f2800 Mon Sep 17 00:00:00 2001 From e6b6d26e1a86a3ff38630121164f83b653f20199 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 2 Nov 2019 06:41:03 +0000 Date: Sat, 2 Nov 2019 06:41:03 +0000
Subject: [PATCH 06/16] Keyguard: Hide padlock unless UDFPS is in use Subject: [PATCH 06/16] Keyguard: Hide padlock unless UDFPS is in use

2
patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch
View File

@ -1,4 +1,4 @@
From 87bc53364912c939e19465304593cf7f03b96b54 Mon Sep 17 00:00:00 2001 From 66149d4057081df5f550cad82db44b5c0f2bd0c7 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 1 Sep 2021 14:41:53 +0000 Date: Wed, 1 Sep 2021 14:41:53 +0000
Subject: [PATCH 07/16] Keyguard: Never switch to large clock Subject: [PATCH 07/16] Keyguard: Never switch to large clock

2
patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch
View File

@ -1,4 +1,4 @@
From ce11b93da782f5bd95c0f5c7ce02aa6ace01e6eb Mon Sep 17 00:00:00 2001 From 2c4a2751c3ecee97883a3b8606e479ec2068f8c8 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 2 Nov 2019 08:31:36 +0000 Date: Sat, 2 Nov 2019 08:31:36 +0000
Subject: [PATCH 08/16] Keyguard: Refine indication text Subject: [PATCH 08/16] Keyguard: Refine indication text

2
patches_platform_personal/frameworks_base/0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch
View File

@ -1,4 +1,4 @@
From 3ead32747cd79901a272ed399e88ce957370f0e0 Mon Sep 17 00:00:00 2001 From cca9cb4645f5aa079c5ed39339f02f78a7e68695 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 20 Mar 2021 10:35:14 +0000 Date: Sat, 20 Mar 2021 10:35:14 +0000
Subject: [PATCH 09/16] Keyguard/UI: Fix status bar / quick settings margins Subject: [PATCH 09/16] Keyguard/UI: Fix status bar / quick settings margins

2
patches_platform_personal/frameworks_base/0010-Revert-monet-Add-support-for-monet-cam16.patch
View File

@ -1,4 +1,4 @@
From 9fa5b43574c485faebf2806584f82311fa220b16 Mon Sep 17 00:00:00 2001 From da27cecc0366133f80c38aa479da212faa503181 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 19 Oct 2021 12:11:24 +0000 Date: Tue, 19 Oct 2021 12:11:24 +0000
Subject: [PATCH 10/16] Revert "monet: Add support for monet (cam16)" Subject: [PATCH 10/16] Revert "monet: Add support for monet (cam16)"

2
patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch
View File

@ -1,4 +1,4 @@
From a1a23648cb1a916a9a6da88d68a41a01f6eceb06 Mon Sep 17 00:00:00 2001 From b8fe4a2e79bd273f69bb0331eb0d07ad0454d43f Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 5 Sep 2021 01:20:12 +0000 Date: Sun, 5 Sep 2021 01:20:12 +0000
Subject: [PATCH 11/16] Revert "Update RAT icons to match Silk design" Subject: [PATCH 11/16] Revert "Update RAT icons to match Silk design"

2
patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch
View File

@ -1,4 +1,4 @@
From 1d8c1d751b1bb0b5d36a00eceec1308d6e83523d Mon Sep 17 00:00:00 2001 From fe5e86fc264bf9ca5d6cfa89d28d51bd123c2966 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 7 Oct 2020 14:00:35 +0000 Date: Wed, 7 Oct 2020 14:00:35 +0000
Subject: [PATCH 12/16] UI: Always render windows into cutouts Subject: [PATCH 12/16] UI: Always render windows into cutouts

2
patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch
View File

@ -1,4 +1,4 @@
From e79fe0c08cb680f1c2855caa877acacdf0bdb3dd Mon Sep 17 00:00:00 2001 From e2fe18aa9aab73594414b11164ed180ca8b16cd1 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 1 Sep 2021 14:10:50 +0000 Date: Wed, 1 Sep 2021 14:10:50 +0000
Subject: [PATCH 13/16] UI: Kill rounded corners in notification scrim Subject: [PATCH 13/16] UI: Kill rounded corners in notification scrim

2
patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch
View File

@ -1,4 +1,4 @@
From f0d1748dc95cb747329c816153d68954255be322 Mon Sep 17 00:00:00 2001 From 81538d4126c99a86cb8f3ea13becca665db468e8 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 26 Oct 2020 14:06:56 +0000 Date: Mon, 26 Oct 2020 14:06:56 +0000
Subject: [PATCH 14/16] UI: Reconfigure power menu items Subject: [PATCH 14/16] UI: Reconfigure power menu items

2
patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch
View File

@ -1,4 +1,4 @@
From ec1007b99324812eebc112d12f6f56666cd54cae Mon Sep 17 00:00:00 2001 From 39e52d3177af783e0fdb08f997d1a4971485b896 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 29 Jun 2021 22:57:01 +0000 Date: Tue, 29 Jun 2021 22:57:01 +0000
Subject: [PATCH 15/16] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT Subject: [PATCH 15/16] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT

2
patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch
View File

@ -1,4 +1,4 @@
From ac98eee7ee113a71ae05e00c23b14e94c3539f73 Mon Sep 17 00:00:00 2001 From 9248a81745f91699e2b6891746536deaab96dbf0 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 19 Oct 2021 12:09:34 +0000 Date: Tue, 19 Oct 2021 12:09:34 +0000
Subject: [PATCH 16/16] UI: Remove privacy dot padding Subject: [PATCH 16/16] UI: Remove privacy dot padding

4
patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Adjust-colors-and-layout.patch
View File

@ -1,7 +1,7 @@
From 82f334dccb2d14c1415ad31ec955b646b5ef0903 Mon Sep 17 00:00:00 2001 From 912c63f44eb3e5c9dbdeea2ec344544b065e524f Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Mon, 5 Mar 2018 23:12:46 +0800 Date: Mon, 5 Mar 2018 23:12:46 +0800
Subject: [PATCH 1/3] DeskClock: Adjust colors and layout Subject: [PATCH 1/4] DeskClock: Adjust colors and layout
Change-Id: I6e876ddf94bdf63062630764beb9b5139110fe4d Change-Id: I6e876ddf94bdf63062630764beb9b5139110fe4d
--- ---

12
patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Remove-night-mode.patch → patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Remove-night-mode.patch
View File

@ -1,7 +1,7 @@
From 5778373cb0bfbf81bfb264930a61435a1c5eda2a Mon Sep 17 00:00:00 2001 From ced2463ffce1b064312ac607fcab72ef3a7a3c3c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 5 Sep 2021 00:30:33 +0000 Date: Sun, 5 Sep 2021 00:30:33 +0000
Subject: [PATCH 3/3] DeskClock: Remove night mode Subject: [PATCH 2/4] DeskClock: Remove night mode
Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a
--- ---
@ -28,10 +28,10 @@ index 1680aab83..73375dcfa 100644
\ No newline at end of file \ No newline at end of file
+</PreferenceScreen> +</PreferenceScreen>
diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java
index 7f01d880a..b295d7a77 100644 index 49530d44c..864a41575 100644
--- a/src/com/android/deskclock/Screensaver.java --- a/src/com/android/deskclock/Screensaver.java
+++ b/src/com/android/deskclock/Screensaver.java +++ b/src/com/android/deskclock/Screensaver.java
@@ -166,9 +166,8 @@ public final class Screensaver extends DreamService { @@ -164,9 +164,8 @@ public final class Screensaver extends DreamService {
private void setClockStyle() { private void setClockStyle() {
Utils.setScreensaverClockStyle(mDigitalClock, mAnalogClock); Utils.setScreensaverClockStyle(mDigitalClock, mAnalogClock);
@ -44,10 +44,10 @@ index 7f01d880a..b295d7a77 100644
/** /**
diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
index 14c9bab00..912d59b2c 100644 index e1db8c5ff..a735263b3 100644
--- a/src/com/android/deskclock/ScreensaverActivity.java --- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java +++ b/src/com/android/deskclock/ScreensaverActivity.java
@@ -119,7 +119,7 @@ public class ScreensaverActivity extends BaseActivity { @@ -117,7 +117,7 @@ public class ScreensaverActivity extends BaseActivity {
Utils.setClockIconTypeface(mMainClockView); Utils.setClockIconTypeface(mMainClockView);
Utils.setTimeFormat((TextClock) digitalClock, false); Utils.setTimeFormat((TextClock) digitalClock, false);
Utils.setClockStyle(digitalClock, analogClock); Utils.setClockStyle(digitalClock, analogClock);

561
patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Revert-date-and-clock-to-Lollipop-style.patch
View File

@ -1,561 +0,0 @@
From 9dbc9d8105c3df1efe714d509622d338e7b9413f Mon Sep 17 00:00:00 2001
From: AndyCGYan <GeForce8800Ultra@gmail.com>
Date: Wed, 26 Dec 2018 22:38:54 +0800
Subject: [PATCH 2/3] DeskClock: Revert date and clock to Lollipop style
Also added dynamic date format based on alarm presence
Change-Id: I04ce41d4817c794edb1579dc3a493a1cf1e8d658
---
res/layout-land/main_clock_frame.xml | 1 +
res/layout/date_and_next_alarm_time.xml | 6 ++----
res/layout/digital_widget.xml | 4 ++--
res/layout/digital_widget_sizer.xml | 2 --
res/layout/main_clock_frame.xml | 1 +
res/layout/stopwatch_time.xml | 1 -
res/layout/timer_setup_time.xml | 2 +-
res/layout/world_clock_remote_list_item.xml | 8 +++----
res/values-h560dp/dimens.xml | 2 +-
res/values-h650dp/dimens.xml | 2 +-
res/values-v21/styles.xml | 8 +++----
res/values-v23/styles.xml | 2 --
res/values/dimens.xml | 10 ++++-----
res/values/styles.xml | 5 +++--
.../alarmclock/DigitalAppWidgetProvider.java | 10 +++++++--
src/com/android/deskclock/ClockFragment.java | 21 ++++++++++++-------
src/com/android/deskclock/Screensaver.java | 8 ++++---
.../deskclock/ScreensaverActivity.java | 8 ++++---
src/com/android/deskclock/Utils.java | 16 ++++++++++++--
19 files changed, 70 insertions(+), 47 deletions(-)
diff --git a/res/layout-land/main_clock_frame.xml b/res/layout-land/main_clock_frame.xml
index b72f62333..a1fa3557d 100644
--- a/res/layout-land/main_clock_frame.xml
+++ b/res/layout-land/main_clock_frame.xml
@@ -38,6 +38,7 @@
<com.android.deskclock.widget.AutoSizingTextClock
android:id="@+id/digital_clock"
style="@style/display_time"
+ android:fontFamily="sans-serif-thin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="none"
diff --git a/res/layout/date_and_next_alarm_time.xml b/res/layout/date_and_next_alarm_time.xml
index ad25502a8..e4edff237 100644
--- a/res/layout/date_and_next_alarm_time.xml
+++ b/res/layout/date_and_next_alarm_time.xml
@@ -25,8 +25,7 @@
android:id="@+id/date"
style="@style/body"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAllCaps="true" />
+ android:layout_height="wrap_content" />
<TextView
android:id="@+id/nextAlarmIcon"
@@ -45,7 +44,6 @@
android:id="@+id/nextAlarm"
style="@style/body"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAllCaps="true" />
+ android:layout_height="wrap_content" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml
index c5b4837a6..7e2bae454 100644
--- a/res/layout/digital_widget.xml
+++ b/res/layout/digital_widget.xml
@@ -43,13 +43,13 @@
<TextClock
android:id="@+id/date"
style="@style/widget_label"
+ android:fontFamily="sans-serif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="none"
android:includeFontPadding="false"
android:singleLine="true"
- android:textAllCaps="true"
android:textColor="@color/white" />
<ImageView
@@ -63,13 +63,13 @@
<TextView
android:id="@+id/nextAlarm"
style="@style/widget_label"
+ android:fontFamily="sans-serif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="none"
android:includeFontPadding="false"
android:singleLine="true"
- android:textAllCaps="true"
android:textColor="@color/white" />
</LinearLayout>
diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
index f524cf536..7b08ca590 100644
--- a/res/layout/digital_widget_sizer.xml
+++ b/res/layout/digital_widget_sizer.xml
@@ -46,7 +46,6 @@
android:includeFontPadding="false"
android:ellipsize="none"
android:singleLine="true"
- android:textAllCaps="true"
android:textColor="@color/white" />
<!-- This view is drawn to a Bitmap and sent to the widget as an icon. -->
@@ -71,7 +70,6 @@
android:includeFontPadding="false"
android:ellipsize="none"
android:singleLine="true"
- android:textAllCaps="true"
android:textColor="@color/white" />
</LinearLayout>
diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml
index ab960728f..2042c5b04 100644
--- a/res/layout/main_clock_frame.xml
+++ b/res/layout/main_clock_frame.xml
@@ -51,6 +51,7 @@
<com.android.deskclock.widget.AutoSizingTextClock
android:id="@+id/digital_clock"
style="@style/display_time"
+ android:fontFamily="sans-serif-thin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="none"
diff --git a/res/layout/stopwatch_time.xml b/res/layout/stopwatch_time.xml
index c1895b488..71320fcd0 100644
--- a/res/layout/stopwatch_time.xml
+++ b/res/layout/stopwatch_time.xml
@@ -42,7 +42,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:duplicateParentState="true"
- android:fontFamily="sans-serif"
android:includeFontPadding="false"
android:paddingEnd="30dp"
android:paddingStart="3dp"
diff --git a/res/layout/timer_setup_time.xml b/res/layout/timer_setup_time.xml
index 572063fc6..14e9ea3bb 100644
--- a/res/layout/timer_setup_time.xml
+++ b/res/layout/timer_setup_time.xml
@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="none"
- android:fontFamily="sans-serif"
+ android:fontFamily="sans-serif-light"
android:fontFeatureSettings="tnum"
android:includeFontPadding="false"
android:singleLine="true"
diff --git a/res/layout/world_clock_remote_list_item.xml b/res/layout/world_clock_remote_list_item.xml
index 9a69cb517..f5f4eaa21 100644
--- a/res/layout/world_clock_remote_list_item.xml
+++ b/res/layout/world_clock_remote_list_item.xml
@@ -58,13 +58,13 @@
<TextView
android:id="@+id/city_name_left"
style="@style/widget_label"
+ android:fontFamily="sans-serif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:ellipsize="end"
android:includeFontPadding="false"
android:singleLine="true"
- android:textAllCaps="true"
android:textColor="@color/white"
android:textSize="@dimen/city_widget_name_font_size" />
@@ -73,6 +73,7 @@
<TextView
android:id="@+id/city_day_left"
style="@style/widget_label"
+ android:fontFamily="sans-serif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/style_label_space"
@@ -81,7 +82,6 @@
android:format24Hour="@string/abbrev_wday"
android:includeFontPadding="false"
android:singleLine="true"
- android:textAllCaps="true"
android:textColor="@color/white"
android:textSize="@dimen/city_widget_name_font_size" />
@@ -120,13 +120,13 @@
<TextView
android:id="@+id/city_name_right"
style="@style/widget_label"
+ android:fontFamily="sans-serif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:ellipsize="end"
android:includeFontPadding="false"
android:singleLine="true"
- android:textAllCaps="true"
android:textColor="@color/white"
android:textSize="@dimen/city_widget_name_font_size" />
@@ -135,6 +135,7 @@
<TextView
android:id="@+id/city_day_right"
style="@style/widget_label"
+ android:fontFamily="sans-serif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/style_label_space"
@@ -143,7 +144,6 @@
android:format24Hour="@string/abbrev_wday"
android:includeFontPadding="false"
android:singleLine="true"
- android:textAllCaps="true"
android:textColor="@color/white"
android:textSize="@dimen/city_widget_name_font_size" />
diff --git a/res/values-h560dp/dimens.xml b/res/values-h560dp/dimens.xml
index 003a5ad9f..6e25621ab 100644
--- a/res/values-h560dp/dimens.xml
+++ b/res/values-h560dp/dimens.xml
@@ -16,5 +16,5 @@
<resources>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">96dp</dimen>
+ <dimen name="widget_max_clock_font_size">88dp</dimen>
</resources>
\ No newline at end of file
diff --git a/res/values-h650dp/dimens.xml b/res/values-h650dp/dimens.xml
index 2cc58cb32..6e25621ab 100644
--- a/res/values-h650dp/dimens.xml
+++ b/res/values-h650dp/dimens.xml
@@ -16,5 +16,5 @@
<resources>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">100dp</dimen>
+ <dimen name="widget_max_clock_font_size">88dp</dimen>
</resources>
\ No newline at end of file
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index f1dca16c0..7bc382a4d 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -18,17 +18,17 @@
<resources>
<style name="body">
- <item name="android:textSize">14sp</item>
+ <item name="android:textSize">16sp</item>
<item name="android:textColor">@color/white</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">sans-serif</item>
</style>
<style name="PrimaryLabelTextAppearance" parent="PrimaryLabelTextParentAppearance">
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">sans-serif</item>
</style>
<style name="SecondaryLabelTextAppearance" parent="SecondaryLabelTextParentAppearance">
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">sans-serif</item>
</style>
</resources>
diff --git a/res/values-v23/styles.xml b/res/values-v23/styles.xml
index 34dcf5d73..6bf964256 100644
--- a/res/values-v23/styles.xml
+++ b/res/values-v23/styles.xml
@@ -26,8 +26,6 @@
</style>
<style name="widget_label" parent="label">
- <item name="android:textAllCaps">true</item>
- <item name="android:letterSpacing">0.15</item>
<item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
<item name="android:shadowColor">@color/widget_shadow_color</item>
<item name="android:shadowDx">@dimen/widget_shadow_dx</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6a384e94b..442fdb1cc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -44,7 +44,7 @@
<dimen name="alarm_lockscreen_bottom_margin">40dp</dimen>
<dimen name="main_clock_font_size">64sp</dimen>
- <dimen name="main_clock_digital_font_size">90sp</dimen>
+ <dimen name="main_clock_digital_font_size">88sp</dimen>
<dimen name="main_clock_digital_padding">24dp</dimen>
<dimen name="big_font_size">32sp</dimen>
<dimen name="label_font_size">16sp</dimen>
@@ -93,15 +93,15 @@
<dimen name="digital_widget_city_24_medium_font_size">40sp</dimen>
<!-- The fixed size of the font for the city name / day of week in the city widget. -->
- <dimen name="city_widget_name_font_size">10dp</dimen>
+ <dimen name="city_widget_name_font_size">12dp</dimen>
<!-- The maximum size of the font for the time in widgets. -->
<dimen name="widget_max_clock_font_size">88dp</dimen>
<dimen name="widget_min_world_city_list_size">80dp</dimen>
<!-- shadow styles for widget text with drop shadows -->
- <item name="widget_shadow_radius" format="float" type="dimen">2.75</item>
- <item name="widget_shadow_dx" format="float" type="dimen">2.0</item>
- <item name="widget_shadow_dy" format="float" type="dimen">2.0</item>
+ <item name="widget_shadow_radius" format="float" type="dimen">0</item>
+ <item name="widget_shadow_dx" format="float" type="dimen">0</item>
+ <item name="widget_shadow_dy" format="float" type="dimen">0</item>
<!-- Divider height -->
<dimen name="hairline_height">1dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fbe62ae3a..ca60e46b8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -51,12 +51,13 @@
<style name="world_clock_time">
<item name="android:textSize">48sp</item>
<item name="android:textColor">@color/white</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">sans-serif-thin</item>
</style>
<style name="body">
- <item name="android:textSize">14sp</item>
+ <item name="android:textSize">16sp</item>
<item name="android:textColor">@color/white</item>
+ <item name="android:fontFamily">sans-serif</item>
</style>
<style name="big_thin">
diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
index 3be07eca7..86f1d991e 100644
--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
@@ -453,7 +453,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
*/
private static String getDateFormat(Context context) {
final Locale locale = Locale.getDefault();
- final String skeleton = context.getString(R.string.abbrev_wday_month_day_no_year);
+ final String nextAlarmTime = Utils.getNextAlarm(context);
+ final String skeleton;
+ if (TextUtils.isEmpty(nextAlarmTime)) {
+ skeleton = context.getString(R.string.full_wday_month_day_no_year);
+ } else {
+ skeleton = context.getString(R.string.abbrev_wday_month_day_no_year);
+ }
return DateFormat.getBestDateTimePattern(locale, skeleton);
}
@@ -495,7 +501,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
private int getClockFontSizePx() { return mClockFontSizePx; }
private void setClockFontSizePx(int clockFontSizePx) {
mClockFontSizePx = clockFontSizePx;
- mFontSizePx = max(1, round(clockFontSizePx / 7.5f));
+ mFontSizePx = max(1, round(clockFontSizePx / 5.5f));
mIconFontSizePx = (int) (mFontSizePx * 1.4f);
mIconPaddingPx = mFontSizePx / 3;
}
diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
index b487e52be..1459094ee 100644
--- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java
@@ -80,6 +80,7 @@ public final class ClockFragment extends DeskClockFragment {
private SelectedCitiesAdapter mCityAdapter;
private RecyclerView mCityList;
private String mDateFormat;
+ private String mDateFormatAlarm;
private String mDateFormatForAccessibility;
/**
@@ -103,11 +104,12 @@ public final class ClockFragment extends DeskClockFragment {
final View fragmentView = inflater.inflate(R.layout.clock_fragment, container, false);
- mDateFormat = getString(R.string.abbrev_wday_month_day_no_year);
+ mDateFormat = getString(R.string.full_wday_month_day_no_year);
+ mDateFormatAlarm = getString(R.string.abbrev_wday_month_day_no_year);
mDateFormatForAccessibility = getString(R.string.full_wday_month_day_no_year);
mCityAdapter = new SelectedCitiesAdapter(getActivity(), mDateFormat,
- mDateFormatForAccessibility);
+ mDateFormatAlarm, mDateFormatForAccessibility);
mCityList = (RecyclerView) fragmentView.findViewById(R.id.cities);
mCityList.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -129,7 +131,7 @@ public final class ClockFragment extends DeskClockFragment {
mDigitalClock = (TextClock) mClockFrame.findViewById(R.id.digital_clock);
mAnalogClock = (AnalogClock) mClockFrame.findViewById(R.id.analog_clock);
Utils.setClockIconTypeface(mClockFrame);
- Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mClockFrame);
+ Utils.updateDate(getActivity(), mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mClockFrame);
Utils.setClockStyle(mDigitalClock, mAnalogClock);
Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock);
}
@@ -146,7 +148,8 @@ public final class ClockFragment extends DeskClockFragment {
final Activity activity = getActivity();
- mDateFormat = getString(R.string.abbrev_wday_month_day_no_year);
+ mDateFormat = getString(R.string.full_wday_month_day_no_year);
+ mDateFormatAlarm = getString(R.string.abbrev_wday_month_day_no_year);
mDateFormatForAccessibility = getString(R.string.full_wday_month_day_no_year);
// Watch for system events that effect clock time or format.
@@ -348,13 +351,15 @@ public final class ClockFragment extends DeskClockFragment {
private final Context mContext;
private final boolean mIsPortrait;
private final boolean mShowHomeClock;
- private final String mDateFormat;
- private final String mDateFormatForAccessibility;
+ private static String mDateFormat;
+ private static String mDateFormatAlarm;
+ private static String mDateFormatForAccessibility;
private SelectedCitiesAdapter(Context context, String dateFormat,
- String dateFormatForAccessibility) {
+ String dateFormatAlarm, String dateFormatForAccessibility) {
mContext = context;
mDateFormat = dateFormat;
+ mDateFormatAlarm = dateFormatAlarm;
mDateFormatForAccessibility = dateFormatForAccessibility;
mInflater = LayoutInflater.from(context);
mIsPortrait = Utils.isPortrait(context);
@@ -541,7 +546,7 @@ public final class ClockFragment extends DeskClockFragment {
String dateFormatForAccessibility, boolean showHairline) {
Utils.refreshAlarm(context, itemView);
- Utils.updateDate(dateFormat, dateFormatForAccessibility, itemView);
+ Utils.updateDate(context, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, itemView);
Utils.setClockStyle(mDigitalClock, mAnalogClock);
mHairline.setVisibility(showHairline ? VISIBLE : GONE);
diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java
index 68899d96e..7f01d880a 100644
--- a/src/com/android/deskclock/Screensaver.java
+++ b/src/com/android/deskclock/Screensaver.java
@@ -43,6 +43,7 @@ public final class Screensaver extends DreamService {
private MoveScreensaverRunnable mPositionUpdater;
private String mDateFormat;
+ private String mDateFormatAlarm;
private String mDateFormatForAccessibility;
private View mContentView;
@@ -63,7 +64,7 @@ public final class Screensaver extends DreamService {
private final Runnable mMidnightUpdater = new Runnable() {
@Override
public void run() {
- Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mContentView);
+ Utils.updateDate(Screensaver.this, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mContentView);
}
};
@@ -84,7 +85,8 @@ public final class Screensaver extends DreamService {
setTheme(R.style.Theme_DeskClock);
super.onCreate();
- mDateFormat = getString(R.string.abbrev_wday_month_day_no_year);
+ mDateFormat = getString(R.string.full_wday_month_day_no_year);
+ mDateFormatAlarm = getString(R.string.abbrev_wday_month_day_no_year);
mDateFormatForAccessibility = getString(R.string.full_wday_month_day_no_year);
}
@@ -129,7 +131,7 @@ public final class Screensaver extends DreamService {
getContentResolver().registerContentObserver(uri, false, mSettingsContentObserver);
}
- Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mContentView);
+ Utils.updateDate(this, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mContentView);
Utils.refreshAlarm(this, mContentView);
startPositionUpdater();
diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java
index c7d54af3f..14c9bab00 100644
--- a/src/com/android/deskclock/ScreensaverActivity.java
+++ b/src/com/android/deskclock/ScreensaverActivity.java
@@ -87,11 +87,12 @@ public class ScreensaverActivity extends BaseActivity {
private final Runnable mMidnightUpdater = new Runnable() {
@Override
public void run() {
- Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mContentView);
+ Utils.updateDate(ScreensaverActivity.this, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mContentView);
}
};
private String mDateFormat;
+ private String mDateFormatAlarm;
private String mDateFormatForAccessibility;
private View mContentView;
@@ -103,7 +104,8 @@ public class ScreensaverActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- mDateFormat = getString(R.string.abbrev_wday_month_day_no_year);
+ mDateFormat = getString(R.string.full_wday_month_day_no_year);
+ mDateFormatAlarm = getString(R.string.abbrev_wday_month_day_no_year);
mDateFormatForAccessibility = getString(R.string.full_wday_month_day_no_year);
setContentView(R.layout.desk_clock_saver);
@@ -160,7 +162,7 @@ public class ScreensaverActivity extends BaseActivity {
public void onResume() {
super.onResume();
- Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mContentView);
+ Utils.updateDate(ScreensaverActivity.this, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, mContentView);
Utils.refreshAlarm(ScreensaverActivity.this, mContentView);
startPositionUpdater();
diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
index 6d97912f7..cba5c0909 100644
--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java
@@ -353,6 +353,11 @@ public class Utils {
nextAlarmView.setVisibility(View.GONE);
nextAlarmIconView.setVisibility(View.GONE);
}
+
+ String mDateFormat = context.getString(R.string.full_wday_month_day_no_year);
+ String mDateFormatAlarm = context.getString(R.string.abbrev_wday_month_day_no_year);
+ String mDateFormatForAccessibility = context.getString(R.string.full_wday_month_day_no_year);
+ Utils.updateDate(context, mDateFormat, mDateFormatAlarm, mDateFormatForAccessibility, clock);
}
public static void setClockIconTypeface(View clock) {
@@ -363,14 +368,21 @@ public class Utils {
/**
* Clock views can call this to refresh their date.
**/
- public static void updateDate(String dateSkeleton, String descriptionSkeleton, View clock) {
+ public static void updateDate(Context context, String dateSkeleton, String dateSkeletonAlarm, String descriptionSkeleton, View clock) {
final TextView dateDisplay = (TextView) clock.findViewById(R.id.date);
if (dateDisplay == null) {
return;
}
final Locale l = Locale.getDefault();
- final String datePattern = DateFormat.getBestDateTimePattern(l, dateSkeleton);
+ final String datePattern;
+ final String alarm = getNextAlarm(context);
+ if (!TextUtils.isEmpty(alarm)) {
+ datePattern = DateFormat.getBestDateTimePattern(l, dateSkeletonAlarm);
+ } else {
+ datePattern = DateFormat.getBestDateTimePattern(l, dateSkeleton);
+ }
+
final String descriptionPattern = DateFormat.getBestDateTimePattern(l, descriptionSkeleton);
final Date now = new Date();
--
2.25.1

581
patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Adapt-digital-clocks-to-S-style.patch Normal file
View File

@ -0,0 +1,581 @@
From 0c1aaa76cff06f583c8e4fdc598bf9bf88834cf0 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 19 Jan 2022 18:04:36 +0000
Subject: [PATCH 3/4] DeskClock: Adapt digital clocks to S style
Lollipop is so yesterday...
Bring the layouts of various digital clocks (app, widget, daydream)
in-line, and adjust their styles to match the custom keyguard on S
Caveats/TODO:
- Widget swallows all touch events, even when touching an empty area
- World clocks in widgets are left untouched
Change-Id: I10c6fa213c89ac2f6e342be13fdd6390f7f787b0
---
res/layout-land/main_clock_frame.xml | 18 ++---
res/layout/date_and_next_alarm_time.xml | 51 ++++++------
res/layout/desk_clock_saver.xml | 12 +--
res/layout/digital_widget.xml | 71 ++++++++---------
res/layout/digital_widget_sizer.xml | 77 ++++++++-----------
res/layout/main_clock_frame.xml | 21 +++--
res/values/dimens.xml | 12 ++-
res/values/styles.xml | 18 +++++
.../alarmclock/DigitalAppWidgetProvider.java | 29 ++++---
src/com/android/deskclock/AlarmUtils.java | 2 +-
10 files changed, 162 insertions(+), 149 deletions(-)
diff --git a/res/layout-land/main_clock_frame.xml b/res/layout-land/main_clock_frame.xml
index b72f62333..afa9404f3 100644
--- a/res/layout-land/main_clock_frame.xml
+++ b/res/layout-land/main_clock_frame.xml
@@ -20,10 +20,11 @@
android:gravity="center_horizontal"
android:orientation="vertical">
- <FrameLayout
+ <LinearLayout
android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical|start"
+ android:orientation="vertical">
<com.android.deskclock.AnalogClock
android:id="@+id/analog_clock"
@@ -37,16 +38,13 @@
<com.android.deskclock.widget.AutoSizingTextClock
android:id="@+id/digital_clock"
- style="@style/display_time"
+ style="@style/sc_keyguard_clock"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="none"
- android:singleLine="true"
- android:textSize="@dimen/main_clock_digital_font_size" />
+ android:layout_height="wrap_content" />
- </FrameLayout>
+ <include layout="@layout/date_and_next_alarm_time" />
- <include layout="@layout/date_and_next_alarm_time" />
+ </LinearLayout>
<View
android:id="@+id/hairline"
diff --git a/res/layout/date_and_next_alarm_time.xml b/res/layout/date_and_next_alarm_time.xml
index ad25502a8..d89172637 100644
--- a/res/layout/date_and_next_alarm_time.xml
+++ b/res/layout/date_and_next_alarm_time.xml
@@ -18,34 +18,39 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:gravity="center">
+ android:gravity="center_vertical|start"
+ android:orientation="vertical">
<TextView
android:id="@+id/date"
- style="@style/body"
+ style="@style/sc_keyguard_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAllCaps="true" />
+ android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
+ android:paddingStart="@dimen/sc_keyguard_row_date_start_padding" />
- <TextView
- android:id="@+id/nextAlarmIcon"
- style="@style/body"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginEnd="@dimen/alarm_icon_padding"
- android:layout_marginStart="@dimen/alarm_icon_padding"
- android:ellipsize="none"
- android:includeFontPadding="false"
- android:maxLines="1"
- android:text="@string/clock_emoji" />
-
- <TextView
- android:id="@+id/nextAlarm"
- style="@style/body"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAllCaps="true" />
-
-</LinearLayout>
\ No newline at end of file
+ android:paddingTop="@dimen/sc_keyguard_row_top_padding"
+ android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
+
+ <TextView
+ android:id="@+id/nextAlarmIcon"
+ style="@style/sc_keyguard_row"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginEnd="@dimen/alarm_icon_padding"
+ android:text="@string/clock_emoji"
+ android:textSize="@dimen/sc_keyguard_alarm_icon_size" />
+
+ <TextView
+ android:id="@+id/nextAlarm"
+ style="@style/sc_keyguard_row"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
index dafabfddf..d24219dbb 100644
--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
@@ -42,19 +42,13 @@
<TextClock
android:id="@+id/digital_clock"
- style="@style/big_thin"
+ style="@style/sc_keyguard_clock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginBottom="@dimen/bottom_text_spacing_digital"
- android:ellipsize="none"
- android:gravity="center"
- android:singleLine="true"
- android:textColor="@color/white"
- android:textSize="@dimen/main_clock_font_size" />
+ android:fontFamily="sans-serif-thin" />
<include layout="@layout/date_and_next_alarm_time" />
</LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml
index c5b4837a6..e376a5a7a 100644
--- a/res/layout/digital_widget.xml
+++ b/res/layout/digital_widget.xml
@@ -19,58 +19,53 @@
android:id="@+id/digital_widget"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="top|center_horizontal"
+ android:gravity="center"
android:orientation="vertical">
- <TextClock
- android:id="@+id/clock"
- style="@style/widget_big_thin"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|top"
- android:ellipsize="none"
- android:format12Hour="@string/lock_screen_12_hour_format"
- android:format24Hour="@string/lock_screen_24_hour_format"
- android:includeFontPadding="false"
- android:singleLine="true"
- android:textColor="@color/white" />
-
<LinearLayout
+ android:id="@+id/digital_widget_actual"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|top">
+ android:gravity="center_vertical|start"
+ android:orientation="vertical">
<TextClock
- android:id="@+id/date"
- style="@style/widget_label"
+ android:id="@+id/clock"
+ style="@style/sc_keyguard_clock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:ellipsize="none"
- android:includeFontPadding="false"
- android:singleLine="true"
- android:textAllCaps="true"
- android:textColor="@color/white" />
+ android:format12Hour="@string/lock_screen_12_hour_format"
+ android:format24Hour="@string/lock_screen_24_hour_format" />
- <ImageView
- android:id="@+id/nextAlarmIcon"
+ <TextClock
+ android:id="@+id/date"
+ style="@style/sc_keyguard_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:scaleType="center" />
+ android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
+ android:paddingStart="@dimen/sc_keyguard_row_date_start_padding" />
- <TextView
- android:id="@+id/nextAlarm"
- style="@style/widget_label"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:ellipsize="none"
- android:includeFontPadding="false"
- android:singleLine="true"
- android:textAllCaps="true"
- android:textColor="@color/white" />
+ android:paddingTop="@dimen/sc_keyguard_row_top_padding"
+ android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
+
+ <ImageView
+ android:id="@+id/nextAlarmIcon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:contentDescription="@null"
+ android:scaleType="center" />
+
+ <TextView
+ android:id="@+id/nextAlarm"
+ style="@style/sc_keyguard_row"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ </LinearLayout>
</LinearLayout>
@@ -82,4 +77,4 @@
android:layout_marginTop="20dp"
android:divider="@null" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
index f524cf536..b9a28c79f 100644
--- a/res/layout/digital_widget_sizer.xml
+++ b/res/layout/digital_widget_sizer.xml
@@ -15,64 +15,55 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
android:orientation="vertical">
- <TextClock
- android:id="@+id/clock"
- style="@style/widget_big_thin"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|top"
- android:includeFontPadding="false"
- android:ellipsize="none"
- android:format12Hour="@string/lock_screen_12_hour_format"
- android:format24Hour="@string/lock_screen_24_hour_format"
- android:singleLine="true"
- android:textColor="@color/white" />
-
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|top">
+ android:gravity="center_vertical|start"
+ android:orientation="vertical">
<TextClock
- android:id="@+id/date"
- style="@style/widget_label"
+ android:id="@+id/clock"
+ style="@style/sc_keyguard_clock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:includeFontPadding="false"
- android:ellipsize="none"
- android:singleLine="true"
- android:textAllCaps="true"
- android:textColor="@color/white" />
+ android:format12Hour="@string/lock_screen_12_hour_format"
+ android:format24Hour="@string/lock_screen_24_hour_format" />
- <!-- This view is drawn to a Bitmap and sent to the widget as an icon. -->
- <TextView
- android:id="@+id/nextAlarmIcon"
- style="@style/widget_label"
+ <TextClock
+ android:id="@+id/date"
+ style="@style/sc_keyguard_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:includeFontPadding="false"
- android:ellipsize="none"
- android:singleLine="true"
- android:text="@string/clock_emoji"
- android:textColor="@color/white" />
+ android:paddingTop="@dimen/sc_keyguard_status_area_top_padding"
+ android:paddingStart="@dimen/sc_keyguard_row_date_start_padding" />
- <TextView
- android:id="@+id/nextAlarm"
- style="@style/widget_label"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:includeFontPadding="false"
- android:ellipsize="none"
- android:singleLine="true"
- android:textAllCaps="true"
- android:textColor="@color/white" />
+ android:paddingTop="@dimen/sc_keyguard_row_top_padding"
+ android:paddingStart="@dimen/sc_keyguard_row_alarm_start_padding">
+
+ <!-- This view is drawn to a Bitmap and sent to the widget as an icon. -->
+ <TextView
+ android:id="@+id/nextAlarmIcon"
+ style="@style/sc_keyguard_row"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="@string/clock_emoji" />
+
+ <TextView
+ android:id="@+id/nextAlarm"
+ style="@style/sc_keyguard_row"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ </LinearLayout>
</LinearLayout>
diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml
index ab960728f..72b71d4f4 100644
--- a/res/layout/main_clock_frame.xml
+++ b/res/layout/main_clock_frame.xml
@@ -33,10 +33,11 @@
android:gravity="center_horizontal"
android:orientation="vertical">
- <FrameLayout
+ <LinearLayout
android:layout_width="wrap_content"
- android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical|start"
+ android:orientation="vertical">
<com.android.deskclock.AnalogClock
android:id="@+id/analog_clock"
@@ -50,18 +51,14 @@
<com.android.deskclock.widget.AutoSizingTextClock
android:id="@+id/digital_clock"
- style="@style/display_time"
+ style="@style/sc_keyguard_clock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:ellipsize="none"
- android:includeFontPadding="false"
- android:paddingTop="@dimen/main_clock_digital_padding"
- android:singleLine="true"
- android:textSize="@dimen/main_clock_digital_font_size" />
+ android:paddingTop="@dimen/main_clock_digital_padding" />
- </FrameLayout>
+ <include layout="@layout/date_and_next_alarm_time" />
- <include layout="@layout/date_and_next_alarm_time" />
+ </LinearLayout>
<View
android:id="@+id/hairline"
@@ -77,4 +74,4 @@
android:layout_height="match_parent"
android:layout_weight="@integer/gutter_width_percent" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6a384e94b..c4b47abb7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -62,7 +62,7 @@
<dimen name="body_font_padding">4dp</dimen>
<dimen name="alarm_label_size">14sp</dimen>
- <dimen name="alarm_icon_padding">6dp</dimen>
+ <dimen name="alarm_icon_padding">7dp</dimen>
<dimen name="backspace_icon_size">24dp</dimen>
<dimen name="no_alarms_size">90dp</dimen>
@@ -129,4 +129,14 @@
<!-- KitKat floating action button container height; see -v21 folder for newer platforms. -->
<dimen name="fab_height">96dp</dimen>
+
+ <!-- Keyguard dimens, taken from S fwb -->
+ <dimen name="sc_keyguard_clock_text_size">86dp</dimen>
+ <dimen name="sc_keyguard_row_text_size">16dp</dimen>
+ <dimen name="sc_keyguard_alarm_icon_size">21dp</dimen>
+ <!-- Padding correction values, measured from S fwb -->
+ <dimen name="sc_keyguard_status_area_top_padding">9dp</dimen>
+ <dimen name="sc_keyguard_row_top_padding">11dp</dimen>
+ <dimen name="sc_keyguard_row_date_start_padding">6dp</dimen>
+ <dimen name="sc_keyguard_row_alarm_start_padding">5.5dp</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fbe62ae3a..e9ae028f9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -134,4 +134,22 @@
<item name="android:numbersSelectorColor">?attr/colorAccent</item>
</style>
+ <style name="sc_keyguard_clock">
+ <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFeatureSettings">tnum</item>
+ <item name="android:textSize">@dimen/sc_keyguard_clock_text_size</item>
+ <item name="android:textColor">@color/white</item>
+ <item name="android:ellipsize">none</item>
+ <item name="android:includeFontPadding">false</item>
+ <item name="android:maxLines">1</item>
+ </style>
+
+ <style name="sc_keyguard_row">
+ <item name="android:textSize">@dimen/sc_keyguard_row_text_size</item>
+ <item name="android:textColor">@color/white</item>
+ <item name="android:ellipsize">none</item>
+ <item name="android:includeFontPadding">false</item>
+ <item name="android:maxLines">1</item>
+ </style>
+
</resources>
diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
index 80a724e85..52685f1f4 100644
--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
@@ -211,7 +211,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
if (Utils.isWidgetClickable(wm, widgetId)) {
final Intent openApp = new Intent(context, DeskClock.class);
final PendingIntent pi = PendingIntent.getActivity(context, 0, openApp, 0);
- rv.setOnClickPendingIntent(R.id.digital_widget, pi);
+ rv.setOnClickPendingIntent(R.id.digital_widget_actual, pi);
}
// Configure child views of the remote view.
@@ -243,7 +243,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
final int targetWidthPx = portrait ? minWidthPx : maxWidthPx;
final int targetHeightPx = portrait ? maxHeightPx : minHeightPx;
final int largestClockFontSizePx =
- resources.getDimensionPixelSize(R.dimen.widget_max_clock_font_size);
+ resources.getDimensionPixelSize(R.dimen.sc_keyguard_clock_text_size);
// Create a size template that describes the widget bounds.
final Sizes template = new Sizes(targetWidthPx, targetHeightPx, largestClockFontSizePx);
@@ -314,13 +314,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
}
// Measure the widget at the largest possible size.
- Sizes high = measure(template, template.getLargestClockFontSizePx(), sizer);
+ Sizes high = measure(context, template, template.getLargestClockFontSizePx(), sizer);
if (!high.hasViolations()) {
return high;
}
// Measure the widget at the smallest possible size.
- Sizes low = measure(template, template.getSmallestClockFontSizePx(), sizer);
+ Sizes low = measure(context, template, template.getSmallestClockFontSizePx(), sizer);
if (low.hasViolations()) {
return low;
}
@@ -332,7 +332,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
return low;
}
- final Sizes midSize = measure(template, midFontSize, sizer);
+ final Sizes midSize = measure(context, template, midFontSize, sizer);
if (midSize.hasViolations()) {
high = midSize;
} else {
@@ -395,7 +395,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
* the offscreen {@code sizer} view. Measure the {@code sizer} view and return the resulting
* size measurements.
*/
- private static Sizes measure(Sizes template, int clockFontSize, View sizer) {
+ private static Sizes measure(Context context, Sizes template, int clockFontSize, View sizer) {
// Create a copy of the given template sizes.
final Sizes measuredSizes = template.newSize();
@@ -406,13 +406,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
final TextView nextAlarmIcon = (TextView) sizer.findViewById(R.id.nextAlarmIcon);
// Adjust the font sizes.
- measuredSizes.setClockFontSizePx(clockFontSize);
+ measuredSizes.setClockFontSizePx(context, clockFontSize);
clock.setText(getLongestTimeString(clock));
clock.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mClockFontSizePx);
date.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx);
nextAlarm.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx);
nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx);
- nextAlarmIcon.setPadding(measuredSizes.mIconPaddingPx, 0, measuredSizes.mIconPaddingPx, 0);
+ nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0);
// Measure and layout the sizer.
final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx);
@@ -493,11 +493,16 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
private int getLargestClockFontSizePx() { return mLargestClockFontSizePx; }
private int getSmallestClockFontSizePx() { return mSmallestClockFontSizePx; }
private int getClockFontSizePx() { return mClockFontSizePx; }
- private void setClockFontSizePx(int clockFontSizePx) {
+ private void setClockFontSizePx(Context context, int clockFontSizePx) {
+ final Resources resources = context.getResources();
+ int keyguardClockTextSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_clock_text_size);
+ int keyguardRowTextSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_row_text_size);
+ int keyguardAlarmIconSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_alarm_icon_size);
+ int alarmIconPaddingPx = resources.getDimensionPixelSize(R.dimen.alarm_icon_padding);
mClockFontSizePx = clockFontSizePx;
- mFontSizePx = max(1, round(clockFontSizePx / 7.5f));
- mIconFontSizePx = (int) (mFontSizePx * 1.4f);
- mIconPaddingPx = mFontSizePx / 3;
+ mFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardRowTextSizePx));
+ mIconFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardAlarmIconSizePx));
+ mIconPaddingPx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) alarmIconPaddingPx));
}
/**
diff --git a/src/com/android/deskclock/AlarmUtils.java b/src/com/android/deskclock/AlarmUtils.java
index db60ace95..43767d313 100644
--- a/src/com/android/deskclock/AlarmUtils.java
+++ b/src/com/android/deskclock/AlarmUtils.java
@@ -37,7 +37,7 @@ import java.util.Locale;
public class AlarmUtils {
public static String getFormattedTime(Context context, Calendar time) {
- final String skeleton = DateFormat.is24HourFormat(context) ? "EHm" : "Ehma";
+ final String skeleton = DateFormat.is24HourFormat(context) ? "Hm" : "hma";
final String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton);
return (String) DateFormat.format(pattern, time);
}
--
2.25.1

118
patches_platform_personal/packages_apps_DeskClock/0004-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch Normal file
View File

@ -0,0 +1,118 @@
From 1ed07dfbc441e06da971a04d6a40eaff13c27b3a Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 20 Jan 2022 04:42:03 +0000
Subject: [PATCH 4/4] DeskClock: Wallpaper-based text coloring for digital
clock widget
RemoteViews is such a restrictive PITA
Change-Id: Ie22c4980526575f73ebb4e56780d4c2193cc45d3
---
.../alarmclock/DigitalAppWidgetProvider.java | 57 +++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
index 52685f1f4..fec78bed7 100644
--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java
+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java
@@ -19,6 +19,8 @@ package com.android.alarmclock;
import android.annotation.SuppressLint;
import android.app.AlarmManager;
import android.app.PendingIntent;
+import android.app.WallpaperColors;
+import android.app.WallpaperManager;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProvider;
import android.content.ComponentName;
@@ -108,12 +110,40 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
/** Intent used to deliver the {@link #ACTION_ON_DAY_CHANGE} callback. */
private static final Intent DAY_CHANGE_INTENT = new Intent(ACTION_ON_DAY_CHANGE);
+ private static WallpaperManager mWallpaperManager;
+ private static boolean mDarkText;
+
+ private static void relayoutAllWidgets(Context context) {
+ final AppWidgetManager wm = AppWidgetManager.getInstance(context);
+ final ComponentName provider = new ComponentName(context, DigitalAppWidgetProvider.class);
+ final int[] widgetIds = wm.getAppWidgetIds(provider);
+ for (int widgetId : widgetIds) {
+ relayoutWidget(context, wm, widgetId, wm.getAppWidgetOptions(widgetId));
+ }
+ }
+
+ private static void addOnColorsChangedListener(Context context) {
+ mWallpaperManager.addOnColorsChangedListener(new WallpaperManager.OnColorsChangedListener() {
+ @Override
+ public void onColorsChanged(WallpaperColors colors, int which) {
+ relayoutAllWidgets(context);
+ }
+ }, null);
+ }
+
@Override
public void onEnabled(Context context) {
super.onEnabled(context);
// Schedule the day-change callback if necessary.
updateDayChangeCallback(context);
+
+ // Listen for wallpaper color changes
+ mWallpaperManager = WallpaperManager.getInstance(context);
+ addOnColorsChangedListener(context);
+
+ // Force a relayout to pick up initial colors
+ relayoutAllWidgets(context);
}
@Override
@@ -203,6 +233,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
*/
private static RemoteViews relayoutWidget(Context context, AppWidgetManager wm, int widgetId,
Bundle options, boolean portrait) {
+ // Determine text colors.
+ if (mWallpaperManager == null) {
+ mWallpaperManager = WallpaperManager.getInstance(context);
+ addOnColorsChangedListener(context);
+ }
+ WallpaperColors wallpaperColors = mWallpaperManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM);
+ // Live wallpapers might not implement the WallpaperColors API.
+ if (wallpaperColors == null) {
+ mDarkText = false;
+ } else {
+ mDarkText = (wallpaperColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_TEXT) != 0;
+ }
+
// Create a remote view for the digital clock.
final String packageName = context.getPackageName();
final RemoteViews rv = new RemoteViews(packageName, R.layout.digital_widget);
@@ -260,6 +303,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
rv.setTextViewTextSize(R.id.nextAlarm, COMPLEX_UNIT_PX, sizes.mFontSizePx);
rv.setTextViewTextSize(R.id.clock, COMPLEX_UNIT_PX, sizes.mClockFontSizePx);
+ // Apply the text color to the remote views.
+ if (mDarkText) {
+ rv.setTextColor(R.id.clock, resources.getColor(R.color.black));
+ rv.setTextColor(R.id.date, resources.getColor(R.color.black));
+ rv.setTextColor(R.id.nextAlarm, resources.getColor(R.color.black));
+ } else {
+ rv.setTextColor(R.id.clock, resources.getColor(R.color.white));
+ rv.setTextColor(R.id.date, resources.getColor(R.color.white));
+ rv.setTextColor(R.id.nextAlarm, resources.getColor(R.color.white));
+ }
+
final int smallestWorldCityListSizePx =
resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size);
if (sizes.getListHeight() <= smallestWorldCityListSizePx) {
@@ -414,6 +468,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider {
nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx);
nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0);
+ // Adjust the alarm icon text color before generating its bitmap.
+ nextAlarmIcon.setTextColor(context.getResources().getColor(mDarkText ? R.color.black : R.color.white));
+
// Measure and layout the sizer.
final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx);
final int heightSize = View.MeasureSpec.getSize(measuredSizes.mTargetHeightPx);
--
2.25.1

14
patches_treble/device_phh_treble/0001-treble-Lineage-ify.patch
View File

@ -1,4 +1,4 @@
From d884ed740455da2dc943c14b7c2c41b5a2236c74 Mon Sep 17 00:00:00 2001 From 978be1fd8202655676e335cdd611f9c6756c0025 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 8 Aug 2021 01:43:40 +0000 Date: Sun, 8 Aug 2021 01:43:40 +0000
Subject: [PATCH 1/4] treble: Lineage-ify Subject: [PATCH 1/4] treble: Lineage-ify
@ -30,7 +30,7 @@ index 6a317e4..e69de29 100644
-PRODUCT_COPY_FILES += \ -PRODUCT_COPY_FILES += \
- device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml - device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
diff --git a/base.mk b/base.mk diff --git a/base.mk b/base.mk
index 3655b72..ce99bcc 100644 index 73abbab..057ad0c 100644
--- a/base.mk --- a/base.mk
+++ b/base.mk +++ b/base.mk
@@ -8,12 +8,14 @@ PRODUCT_COPY_FILES := \ @@ -8,12 +8,14 @@ PRODUCT_COPY_FILES := \
@ -68,7 +68,7 @@ index 3655b72..ce99bcc 100644
#VNDK config files #VNDK config files
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
diff --git a/generate.sh b/generate.sh diff --git a/generate.sh b/generate.sh
index b9647b9..66a48a6 100644 index 352fe12..7e4f137 100644
--- a/generate.sh --- a/generate.sh
+++ b/generate.sh +++ b/generate.sh
@@ -65,6 +65,9 @@ for part in a ab;do @@ -65,6 +65,9 @@ for part in a ab;do
@ -169,7 +169,7 @@ index 0000000..8df673a
+ <integer name="config_deviceHardwareWakeKeys">127</integer> + <integer name="config_deviceHardwareWakeKeys">127</integer>
+</resources> +</resources>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 2d5c21e..7a15163 100644 index 89be3f6..bad8f29 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml --- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
@ -181,12 +181,12 @@ index 2d5c21e..7a15163 100644
<integer name="config_multiuserMaximumUsers">5</integer> <integer name="config_multiuserMaximumUsers">5</integer>
<bool name="config_enableMultiUserUI">true</bool> <bool name="config_enableMultiUserUI">true</bool>
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 4ae5095..5e39d5b 100644 index 999ff97..11dd447 100644
--- a/sepolicy/file_contexts --- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts +++ b/sepolicy/file_contexts
@@ -6,9 +6,6 @@ @@ -7,9 +7,6 @@
/system/bin/phh-on-data.sh u:object_r:phhsu_exec:s0
/system/bin/asus-motor u:object_r:phhsu_exec:s0 /system/bin/asus-motor u:object_r:phhsu_exec:s0
/system/bin/xiaomi-touch u:object_r:phhsu_exec:s0
-#/system/bin/fsck\.exfat u:object_r:fsck_exec:s0 -#/system/bin/fsck\.exfat u:object_r:fsck_exec:s0
-/system/bin/fsck\.ntfs u:object_r:fsck_exec:s0 -/system/bin/fsck\.ntfs u:object_r:fsck_exec:s0

2
patches_treble/device_phh_treble/0002-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explicitly.patch
View File

@ -1,4 +1,4 @@
From 0150110fafdb657a9074b484be4d7e4e1dd50c95 Mon Sep 17 00:00:00 2001 From 7ebb3f6332087fb5243955bb28c656e14a411660 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 8 Aug 2021 09:29:32 +0000 Date: Sun, 8 Aug 2021 09:29:32 +0000
Subject: [PATCH 2/4] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly Subject: [PATCH 2/4] treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS explicitly

2
patches_treble/device_phh_treble/0003-treble-Set-TARGET_NO_KERNEL_OVERRIDE.patch
View File

@ -1,4 +1,4 @@
From 882eaf34cd14cbf1c9617498f0318bcaffca8632 Mon Sep 17 00:00:00 2001 From 56c20273ac8c3c34de36f80edc2e94fc5f60b78a Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 20 Oct 2021 11:30:25 +0000 Date: Wed, 20 Oct 2021 11:30:25 +0000
Subject: [PATCH 3/4] treble: Set TARGET_NO_KERNEL_OVERRIDE Subject: [PATCH 3/4] treble: Set TARGET_NO_KERNEL_OVERRIDE

2
patches_treble/device_phh_treble/0004-add-offline-charger-sepolicy.patch
View File

@ -1,4 +1,4 @@
From 53e8034ca13a7e82beeba0f92d75495836ec0061 Mon Sep 17 00:00:00 2001 From 39c3d994822d367cad58827e6cfa8dcd7e13b519 Mon Sep 17 00:00:00 2001
From: Victor Bo <bvoid@yandex.ru> From: Victor Bo <bvoid@yandex.ru>
Date: Tue, 15 Sep 2020 21:26:45 -0400 Date: Tue, 15 Sep 2020 21:26:45 -0400
Subject: [PATCH 4/4] add offline charger sepolicy Subject: [PATCH 4/4] add offline charger sepolicy

23
patches_treble_personal/device_phh_treble/0001-Add-Meizu-18-vibrator-support.patch
View File

@ -1,4 +1,4 @@
From d18f52a69d550666acab021aa3d6261c83cf9299 Mon Sep 17 00:00:00 2001 From d457d9a320d5b87cb994b2e0d09fc1ef35fad1fc Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Tue, 22 Jun 2021 13:38:31 +0000 Date: Tue, 22 Jun 2021 13:38:31 +0000
Subject: [PATCH 1/4] Add Meizu 18 vibrator support Subject: [PATCH 1/4] Add Meizu 18 vibrator support
@ -10,7 +10,7 @@ Thanks to:
Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a
--- ---
base.mk | 3 + base.mk | 5 +-
framework_manifest.xml | 10 ++ framework_manifest.xml | 10 ++
hal/meizu-vibrator/Android.bp | 31 ++++ hal/meizu-vibrator/Android.bp | 31 ++++
hal/meizu-vibrator/Vibrator.cpp | 140 ++++++++++++++++++ hal/meizu-vibrator/Vibrator.cpp | 140 ++++++++++++++++++
@ -19,7 +19,7 @@ Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a
hal/meizu-vibrator/service.cpp | 72 +++++++++ hal/meizu-vibrator/service.cpp | 72 +++++++++
sepolicy/file_contexts | 1 + sepolicy/file_contexts | 1 +
sepolicy/hal.te | 11 ++ sepolicy/hal.te | 11 ++
9 files changed, 332 insertions(+) 9 files changed, 333 insertions(+), 1 deletion(-)
create mode 100644 hal/meizu-vibrator/Android.bp create mode 100644 hal/meizu-vibrator/Android.bp
create mode 100644 hal/meizu-vibrator/Vibrator.cpp create mode 100644 hal/meizu-vibrator/Vibrator.cpp
create mode 100644 hal/meizu-vibrator/Vibrator.h create mode 100644 hal/meizu-vibrator/Vibrator.h
@ -27,16 +27,19 @@ Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a
create mode 100644 hal/meizu-vibrator/service.cpp create mode 100644 hal/meizu-vibrator/service.cpp
diff --git a/base.mk b/base.mk diff --git a/base.mk b/base.mk
index a372603..a537411 100644 index 057ad0c..7e1cdc9 100644
--- a/base.mk --- a/base.mk
+++ b/base.mk +++ b/base.mk
@@ -218,4 +218,7 @@ PRODUCT_COPY_FILES += \ @@ -221,6 +221,9 @@ PRODUCT_COPY_FILES += \
device/phh/treble/proprietary-files/gome/fs16xx_01s_right.preset:system/phh/gome/fs16xx_01s_right.preset \ PRODUCT_PACKAGES += phh-ota
device/phh/treble/proprietary-files/umidigi/fs16xx_01s_mono.preset:system/phh/umidigi/fs16xx_01s_mono.preset
PRODUCT_PACKAGES += \
- xiaomi-touch
+ xiaomi-touch
+
+PRODUCT_PACKAGES += \ +PRODUCT_PACKAGES += \
+ android.hardware.vibrator@1.3-service.meizu + android.hardware.vibrator@1.3-service.meizu
+
include build/make/target/product/gsi_release.mk include build/make/target/product/gsi_release.mk
diff --git a/framework_manifest.xml b/framework_manifest.xml diff --git a/framework_manifest.xml b/framework_manifest.xml
index cb37b49..1b45b4a 100644 index cb37b49..1b45b4a 100644
@ -396,10 +399,10 @@ index 0000000..1405dfb
+ joinRpcThreadpool(); + joinRpcThreadpool();
+} +}
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 5e39d5b..41d395d 100644 index 11dd447..faa7256 100644
--- a/sepolicy/file_contexts --- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts +++ b/sepolicy/file_contexts
@@ -13,6 +13,7 @@ @@ -14,6 +14,7 @@
/system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oppo.compat u:object_r:hal_fingerprint_oppo_compat_exec:s0 /system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oppo.compat u:object_r:hal_fingerprint_oppo_compat_exec:s0
/system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oplus.compat u:object_r:hal_fingerprint_oppo_compat_exec:s0 /system/bin/hw/android.hardware.biometrics.fingerprint@2.1-service.oplus.compat u:object_r:hal_fingerprint_oppo_compat_exec:s0

28
patches_treble_personal/device_phh_treble/0002-Only-use-meizu-vibrator-on-Meizu-18.patch
View File

@ -1,4 +1,4 @@
From 0cca559de53a92eac0e6810ebed31967d70d4ca0 Mon Sep 17 00:00:00 2001 From 72db86f75fae20fef140c4760383acf21902002a Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 27 Jun 2021 05:21:38 +0000 Date: Sun, 27 Jun 2021 05:21:38 +0000
Subject: [PATCH 2/4] Only use meizu-vibrator on Meizu 18 Subject: [PATCH 2/4] Only use meizu-vibrator on Meizu 18
@ -12,8 +12,8 @@ Change-Id: I97fc52a98a77aa72bbd5601f36abc0cf18efbaea
hal/meizu-vibrator/Android.bp | 1 + hal/meizu-vibrator/Android.bp | 1 +
.../android.hardware.vibrator@1.3-service.meizu.xml | 11 +++++++++++ .../android.hardware.vibrator@1.3-service.meizu.xml | 11 +++++++++++
hal/meizu-vibrator/manifest_dummy.xml | 3 +++ hal/meizu-vibrator/manifest_dummy.xml | 3 +++
rw-system.sh | 10 ++++++++-- rw-system.sh | 6 ++++++
5 files changed, 23 insertions(+), 12 deletions(-) 5 files changed, 21 insertions(+), 10 deletions(-)
create mode 100644 hal/meizu-vibrator/android.hardware.vibrator@1.3-service.meizu.xml create mode 100644 hal/meizu-vibrator/android.hardware.vibrator@1.3-service.meizu.xml
create mode 100644 hal/meizu-vibrator/manifest_dummy.xml create mode 100644 hal/meizu-vibrator/manifest_dummy.xml
@ -76,10 +76,10 @@ index 0000000..b34a10b
+<manifest version="1.0" type="framework"> +<manifest version="1.0" type="framework">
+</manifest> +</manifest>
diff --git a/rw-system.sh b/rw-system.sh diff --git a/rw-system.sh b/rw-system.sh
index ee4df70..3ed1cdd 100644 index 5e275af..e8bd30b 100644
--- a/rw-system.sh --- a/rw-system.sh
+++ b/rw-system.sh +++ b/rw-system.sh
@@ -356,6 +356,12 @@ if [ "$foundFingerprint" = false ];then @@ -355,6 +355,12 @@ if [ "$foundFingerprint" = false ];then
mount -o bind system/phh/empty /system/etc/permissions/android.hardware.fingerprint.xml mount -o bind system/phh/empty /system/etc/permissions/android.hardware.fingerprint.xml
fi fi
@ -92,24 +92,6 @@ index ee4df70..3ed1cdd 100644
if ! grep android.hardware.bluetooth /vendor/manifest.xml && ! grep android.hardware.bluetooth /vendor/etc/vintf/manifest.xml; then if ! grep android.hardware.bluetooth /vendor/manifest.xml && ! grep android.hardware.bluetooth /vendor/etc/vintf/manifest.xml; then
mount -o bind system/phh/empty /system/etc/permissions/android.hardware.bluetooth.xml mount -o bind system/phh/empty /system/etc/permissions/android.hardware.bluetooth.xml
mount -o bind system/phh/empty /system/etc/permissions/android.hardware.bluetooth_le.xml mount -o bind system/phh/empty /system/etc/permissions/android.hardware.bluetooth_le.xml
@@ -427,7 +433,7 @@ if getprop ro.build.overlay.deviceid |grep -q -e CPH1859 -e CPH1861 -e RMX1811 -
setprop persist.sys.qcom-brightness "$(cat /sys/class/leds/lcd-backlight/max_brightness)"
fi
-if getprop ro.build.overlay.deviceid |grep -iq -e RMX2020 -e RMX2027 -e RMX2040 -e RMX2193 -e RMX2191;then
+if getprop ro.build.overlay.deviceid |grep -iq -e RMX2020 -e RMX2027 -e RMX2040 -e RMX2193 -e RMX2191;then
setprop persist.sys.qcom-brightness 2047
setprop persist.sys.overlay.devinputjack true
setprop persist.sys.phh.fingerprint.nocleanup true
@@ -940,7 +946,7 @@ if (getprop ro.vendor.build.fingerprint;getprop ro.odm.build.fingerprint) |grep
setprop persist.sys.phh.fod.bbk true
fi
-if getprop ro.build.overlay.deviceid |grep -iq -e RMX1941 -e RMX1945 -e RMX1943 -e RMX1942;then
+if getprop ro.build.overlay.deviceid |grep -iq -e RMX1941 -e RMX1945 -e RMX1943 -e RMX1942;then
setprop persist.sys.qcom-brightness "$(cat /sys/class/leds/lcd-backlight/max_brightness)"
setprop persist.sys.phh.mainkeys 0
fi
-- --
2.25.1 2.25.1

4
patches_treble_personal/device_phh_treble/0003-Revert-Include-sim-toolkit-app.patch
View File

@ -1,4 +1,4 @@
From 0ff36ed6acdc7addbc61fff048b6f2b028f615c0 Mon Sep 17 00:00:00 2001 From a13abcf3906e73f9a7a1310cbab867488e7627d5 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 28 Oct 2021 01:51:27 +0000 Date: Thu, 28 Oct 2021 01:51:27 +0000
Subject: [PATCH 3/4] Revert "Include sim toolkit app" Subject: [PATCH 3/4] Revert "Include sim toolkit app"
@ -11,7 +11,7 @@ Change-Id: I1eb7f4bb070eea649b4cea6280299e629d1edb3d
1 file changed, 3 deletions(-) 1 file changed, 3 deletions(-)
diff --git a/base.mk b/base.mk diff --git a/base.mk b/base.mk
index a537411..bc5ba37 100644 index 7e1cdc9..09952c8 100644
--- a/base.mk --- a/base.mk
+++ b/base.mk +++ b/base.mk
@@ -157,9 +157,6 @@ PRODUCT_PACKAGES += \ @@ -157,9 +157,6 @@ PRODUCT_PACKAGES += \

2
patches_treble_personal/device_phh_treble/0004-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch
View File

@ -1,4 +1,4 @@
From dfb80c5cb89c33b2be845fec1cca084399a7f71f Mon Sep 17 00:00:00 2001 From 43e4d35bd355a04b3e1692f03400fe853b581ee5 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 8 Aug 2021 09:31:01 +0000 Date: Sun, 8 Aug 2021 09:31:01 +0000
Subject: [PATCH 4/4] Revert "treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS Subject: [PATCH 4/4] Revert "treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS

4
patches_treble_phh/platform_frameworks_av/0001-Fix-BT-in-call-on-CAF-devices.patch
View File

@ -1,7 +1,7 @@
From 4c452bb5ff1f23279efa5200c1c9b04d563bed8f Mon Sep 17 00:00:00 2001 From 2109e8f28ad6b0dd9ed1e6aea80d8f96bcfc6856 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 5 Aug 2019 18:09:50 +0200 Date: Mon, 5 Aug 2019 18:09:50 +0200
Subject: [PATCH 01/18] Fix BT in-call on CAF devices Subject: [PATCH 01/19] Fix BT in-call on CAF devices
See https://github.com/phhusson/treble_experimentations/issues/374 See https://github.com/phhusson/treble_experimentations/issues/374

8
patches_treble_phh/platform_frameworks_av/0002-Add-partial-cam-id-is-hardcoded-support-for-Asus-ZF6.patch
View File

@ -1,7 +1,7 @@
From 8ee7ce7f56c8f45288e9a0135a8ee20f18d79b57 Mon Sep 17 00:00:00 2001 From efb1576f000a7bf89e53381c5863dbe5e407f77e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 1 Oct 2019 13:35:49 +0200 Date: Tue, 1 Oct 2019 13:35:49 +0200
Subject: [PATCH 02/18] Add (partial, cam id is hardcoded) support for Asus ZF6 Subject: [PATCH 02/19] Add (partial, cam id is hardcoded) support for Asus ZF6
motor camera motor camera
Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
@ -11,7 +11,7 @@ Change-Id: Iea6e1370780a1d16f728748d1d948d092532d8fe
2 files changed, 29 insertions(+) 2 files changed, 29 insertions(+)
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index d0d3a9d81b..6705186fdd 100644 index 04b56048e0..24b022226f 100644
--- a/services/camera/libcameraservice/CameraService.cpp --- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
@ -66,7 +66,7 @@ index d0d3a9d81b..6705186fdd 100644
Status CameraService::setTorchMode(const String16& cameraId, bool enabled, Status CameraService::setTorchMode(const String16& cameraId, bool enabled,
const sp<IBinder>& clientBinder) { const sp<IBinder>& clientBinder) {
Mutex::Autolock lock(mServiceLock); Mutex::Autolock lock(mServiceLock);
@@ -3049,6 +3073,8 @@ binder::Status CameraService::BasicClient::disconnect() { @@ -3054,6 +3078,8 @@ binder::Status CameraService::BasicClient::disconnect() {
} }
mDisconnected = true; mDisconnected = true;

4
patches_treble_phh/platform_frameworks_av/0003-audiopolicy-try-again-with-trimmed-audio-port-name-i.patch
View File

@ -1,7 +1,7 @@
From 307bf28e8863d55291bb52cf5724fa0f541adfcd Mon Sep 17 00:00:00 2001 From 9f19a75cd2c476e071f61bea35d8f082943c3522 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net> From: Peter Cai <peter@typeblog.net>
Date: Thu, 23 Jan 2020 11:13:43 +0800 Date: Thu, 23 Jan 2020 11:13:43 +0800
Subject: [PATCH 03/18] audiopolicy: try again with trimmed audio port name if Subject: [PATCH 03/19] audiopolicy: try again with trimmed audio port name if
not found not found
* In Spreadtrum BSP, some audio routes may contain ports with extra * In Spreadtrum BSP, some audio routes may contain ports with extra

4
patches_treble_phh/platform_frameworks_av/0004-There-are-three-SCO-devices.-Fallback-from-one-to-th.patch
View File

@ -1,7 +1,7 @@
From be6b7ba5a52fda8a3dba06e4b58cf7f91b1f166e Mon Sep 17 00:00:00 2001 From 94c8075354ae12fabd2c7c3cef2a3623bb38813f Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 13 Apr 2020 21:01:16 +0200 Date: Mon, 13 Apr 2020 21:01:16 +0200
Subject: [PATCH 04/18] There are three SCO devices. Fallback from one to the Subject: [PATCH 04/19] There are three SCO devices. Fallback from one to the
others if needed others if needed
Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2 Change-Id: I414dcb6b154855c00cb8520b23dc1069827864b2

4
patches_treble_phh/platform_frameworks_av/0005-Add-persist.sys.phh.samsung.camera_ids-property-to-a.patch
View File

@ -1,7 +1,7 @@
From 9e9c10692262d752934e2343dfe76b0582c23601 Mon Sep 17 00:00:00 2001 From d729bbcff505ed46d6e8251475d5662a4207d935 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 14 May 2020 19:54:55 +0200 Date: Thu, 14 May 2020 19:54:55 +0200
Subject: [PATCH 05/18] Add persist.sys.phh.samsung.camera_ids property to Subject: [PATCH 05/19] Add persist.sys.phh.samsung.camera_ids property to
access hidden Samsung cameras access hidden Samsung cameras
Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593 Change-Id: I2c7bf535272acc28ed2277e96c78ddd28a0b4593

6
patches_treble_phh/platform_frameworks_av/0006-Add-a-property-to-force-camera-timestamp-source.patch
View File

@ -1,7 +1,7 @@
From 13f93488d8f5f2ebf9e350cd9f0f0cc0f7e8313d Mon Sep 17 00:00:00 2001 From 7ff037ed35bbb81e8834b762248fea580e1f7dea Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 19 May 2020 14:01:14 +0200 Date: Tue, 19 May 2020 14:01:14 +0200
Subject: [PATCH 06/18] Add a property to force camera timestamp source Subject: [PATCH 06/19] Add a property to force camera timestamp source
Some devices wrongly report their timesource Some devices wrongly report their timesource
Camera's timesource can either be CLOCK_MONOTONIC, or CLOCK_BOOTTIME Camera's timesource can either be CLOCK_MONOTONIC, or CLOCK_BOOTTIME
@ -18,7 +18,7 @@ timestamp source.
1 file changed, 10 insertions(+), 2 deletions(-) 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index fd645c7a72..4a6a922c43 100644 index 87c1c750ed..b4a58ec749 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp --- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -346,8 +346,16 @@ status_t Camera3Device::initializeCommonLocked() { @@ -346,8 +346,16 @@ status_t Camera3Device::initializeCommonLocked() {

4
patches_treble_phh/platform_frameworks_av/0007-FIH-devices-Fix-Earpiece-audio-output.patch
View File

@ -1,7 +1,7 @@
From ccc5945c9b22dd3e96cf8ed602d8fc1697dedb87 Mon Sep 17 00:00:00 2001 From 39f279a2575ea4bf23672224c9b7b37dbe199007 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 24 Apr 2018 00:14:28 +0200 Date: Tue, 24 Apr 2018 00:14:28 +0200
Subject: [PATCH 07/18] FIH devices: Fix "Earpiece" audio output Subject: [PATCH 07/19] FIH devices: Fix "Earpiece" audio output
On some FIH devices (confirmed on Razer, and probably on Aquos SS2), On some FIH devices (confirmed on Razer, and probably on Aquos SS2),
Earpiece is not listed in attachedDevices, and devicePort's profile Earpiece is not listed in attachedDevices, and devicePort's profile

4
patches_treble_phh/platform_frameworks_av/0008-No-longer-make-re-assigning-legacy-audio-groups-fata.patch
View File

@ -1,7 +1,7 @@
From 4babf9d2e8c5169cabe185b99bce89e0ccfa1b9b Mon Sep 17 00:00:00 2001 From 47acdf3a578d5d55c98b0f59906c4728248e6687 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 12 Sep 2020 12:32:50 +0200 Date: Sat, 12 Sep 2020 12:32:50 +0200
Subject: [PATCH 08/18] No longer make re-assigning legacy audio groups fatal. Subject: [PATCH 08/19] No longer make re-assigning legacy audio groups fatal.
Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined Mi9 declares AUDIO_STREAM_PATCH and AUDIO_STREAM_REROUTING which is defined
by framework too by framework too

4
patches_treble_phh/platform_frameworks_av/0009-Add-persist.sys.phh.disable_a2dp_offload-property-to.patch
View File

@ -1,7 +1,7 @@
From cfc4fa6db350285e5a6ab87735e9252a1c070509 Mon Sep 17 00:00:00 2001 From 1bb61eb2a2777c127b191599d796b5476a26c807 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 25 May 2020 21:26:54 +0200 Date: Mon, 25 May 2020 21:26:54 +0200
Subject: [PATCH 09/18] Add persist.sys.phh.disable_a2dp_offload property to Subject: [PATCH 09/19] Add persist.sys.phh.disable_a2dp_offload property to
force a2dp offload force a2dp offload
Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea Change-Id: Id474540c33c594cc4010a1a398d82bff8aadaeea

4
patches_treble_phh/platform_frameworks_av/0010-Make-camera-IDs-filter-out-optional.patch
View File

@ -1,7 +1,7 @@
From 5f2eb5d0a7224f6f466de35c9eeed3ae5a4dbf5e Mon Sep 17 00:00:00 2001 From bba858703aee4bcfaaa38ad9f2da7be018fffc17 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 21 Dec 2020 20:19:11 +0100 Date: Mon, 21 Dec 2020 20:19:11 +0100
Subject: [PATCH 10/18] Make camera IDs filter-out optional Subject: [PATCH 10/19] Make camera IDs filter-out optional
Nowadays most people have Camera 2 apps, and would like to have all Nowadays most people have Camera 2 apps, and would like to have all
cameras, rather than limit which cameras are available. cameras, rather than limit which cameras are available.

4
patches_treble_phh/platform_frameworks_av/0011-Support-Samsung-R-multi-cams.patch
View File

@ -1,7 +1,7 @@
From 2f93928141323d08cba2f10517c4338d3af0ef59 Mon Sep 17 00:00:00 2001 From ed5f24d5cf810c146b60b90a01a85a37ab6c4a28 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 13 Mar 2021 14:20:03 -0500 Date: Sat, 13 Mar 2021 14:20:03 -0500
Subject: [PATCH 11/18] Support Samsung R multi-cams Subject: [PATCH 11/19] Support Samsung R multi-cams
Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555 Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555
--- ---

4
patches_treble_phh/platform_frameworks_av/0012-Don-t-crash-on-unknown-audio-devices.patch
View File

@ -1,7 +1,7 @@
From fe8421d437012b5909d3dae6dec2969e67260826 Mon Sep 17 00:00:00 2001 From 088360f986f6c7c009019eacf10dfc4f1cf5d6a0 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 23 Mar 2021 00:16:42 +0100 Date: Tue, 23 Mar 2021 00:16:42 +0100
Subject: [PATCH 12/18] Don't crash on unknown audio devices Subject: [PATCH 12/19] Don't crash on unknown audio devices
Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919 Change-Id: I2df8d88f742da6a84aa8888cdf19de25444de919
--- ---

4
patches_treble_phh/platform_frameworks_av/0013-Reenable-STRATEGY_ROUTING.-This-is-a-leftover-of-tri.patch
View File

@ -1,7 +1,7 @@
From d3d598ad4f8d22fefd4248e9fc04fb77c2800ace Mon Sep 17 00:00:00 2001 From 3e64779329fa068fed4fa0f66e2cf498611dc901 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 28 Mar 2021 14:47:52 +0200 Date: Sun, 28 Mar 2021 14:47:52 +0200
Subject: [PATCH 13/18] Reenable STRATEGY_ROUTING. This is a leftover of tries Subject: [PATCH 13/19] Reenable STRATEGY_ROUTING. This is a leftover of tries
of 587b198, wrongly commited in 20f869 of 587b198, wrongly commited in 20f869
--- ---

4
patches_treble_phh/platform_frameworks_av/0014-Use-a-fake-volume-policy-when-none-has-been-found.patch
View File

@ -1,7 +1,7 @@
From f150ef9a8d0776fbd2123662aac7315ba7bd48de Mon Sep 17 00:00:00 2001 From 2b230756e1dc4c184557c577da7aa65f1a890be3 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 28 Mar 2021 14:48:49 +0200 Date: Sun, 28 Mar 2021 14:48:49 +0200
Subject: [PATCH 14/18] Use a fake volume policy when none has been found Subject: [PATCH 14/19] Use a fake volume policy when none has been found
This is useful, because on Samsung devices, the "real" This is useful, because on Samsung devices, the "real"
(=non-gsi-cheating) audio policy doesn't have any volume policy. (=non-gsi-cheating) audio policy doesn't have any volume policy.

4
patches_treble_phh/platform_frameworks_av/0015-Not-all-sources-in-a-route-are-valid.-Dont-ignore-th.patch
View File

@ -1,7 +1,7 @@
From 244b0d93a9a1c3d2425b50c11f5c1abf310d21f9 Mon Sep 17 00:00:00 2001 From 504363194ce939aaacf76d0e3f09106d8d68b139 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 28 Mar 2021 18:54:47 +0200 Date: Sun, 28 Mar 2021 18:54:47 +0200
Subject: [PATCH 15/18] Not all sources in a route are valid. Dont ignore the Subject: [PATCH 15/19] Not all sources in a route are valid. Dont ignore the
whole route because of one broken source whole route because of one broken source
Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d Change-Id: If8a51740e71bef3a4738262ad7b43a337b0ec36d

4
patches_treble_phh/platform_frameworks_av/0016-When-aux-cameras-are-enabled-ignore-system-only-came.patch
View File

@ -1,7 +1,7 @@
From f69403f665a91492fcfd5d2afe52b8e88c903b85 Mon Sep 17 00:00:00 2001 From 42780cbfbbb8ad0f5eef80541cb251c54c41129a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 7 Aug 2021 11:11:39 +0200 Date: Sat, 7 Aug 2021 11:11:39 +0200
Subject: [PATCH 16/18] When aux cameras are enabled, ignore "system only" Subject: [PATCH 16/19] When aux cameras are enabled, ignore "system only"
camera flag (it shouldnt be q security issue since secure cameras are listed camera flag (it shouldnt be q security issue since secure cameras are listed
otherwise) otherwise)

6
patches_treble_phh/platform_frameworks_av/0017-APM-Restore-R-and-Q-behavior-respectively-for-teleph.patch
View File

@ -1,7 +1,7 @@
From 2140c752c78511852fef8fe2320d62ff88fb4a6c Mon Sep 17 00:00:00 2001 From 7dd1be6f9d683cdb8a204e3ffde84f08a638d93d Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net> From: Peter Cai <peter@typeblog.net>
Date: Tue, 19 Oct 2021 21:16:55 -0400 Date: Tue, 19 Oct 2021 21:16:55 -0400
Subject: [PATCH 17/18] APM: Restore R and Q behavior respectively for Subject: [PATCH 17/19] APM: Restore R and Q behavior respectively for
telephony audio telephony audio
This conditionally reverts part of 51c9cc (S) and afd4ce (R) when the This conditionally reverts part of 51c9cc (S) and afd4ce (R) when the
@ -34,7 +34,7 @@ Change-Id: I56d36d2aef4319935cb88a3e4771b23c6d5b2145
2 files changed, 28 insertions(+), 4 deletions(-) 2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index cc2d8e8cf4..8defaad32c 100644 index cb9d70055e..dad066ec7f 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -601,6 +601,11 @@ status_t AudioPolicyManager::updateCallRoutingInternal( @@ -601,6 +601,11 @@ status_t AudioPolicyManager::updateCallRoutingInternal(

4
patches_treble_phh/platform_frameworks_av/0018-Revert-Remove-support-for-audio-HAL-V2-from-the-fram.patch
View File

@ -1,7 +1,7 @@
From e7f31e63f87dd23e421645783a672ce00e9f1122 Mon Sep 17 00:00:00 2001 From 40839d6f809c90177f3b5160954d2e8abc6cb8f6 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 11 Oct 2021 16:10:42 -0400 Date: Mon, 11 Oct 2021 16:10:42 -0400
Subject: [PATCH 18/18] Revert "Remove support for audio HAL V2 from the Subject: [PATCH 18/19] Revert "Remove support for audio HAL V2 from the
framework" framework"
This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251. This reverts commit cbf517f837f7bf8a59f3ff8aa1e0e3e19612e251.

29
patches_treble_phh/platform_frameworks_av/0019-Fix-parsing-audio-hal-7.0-audio-policies.patch Normal file
View File

@ -0,0 +1,29 @@
From 0ab558df019b2841415ac58d8cf9acc17c217b8a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 30 Jan 2022 07:40:19 -0500
Subject: [PATCH 19/19] Fix parsing audio hal 7.0 audio policies
Google changed separator from natural "," to weird " "
We broke its support in "FIH devices: Fix "Earpiece" audio output"
Change-Id: I458b8b6a6498dd9cf748e00843ff65c561579902
---
.../audiopolicy/common/managerdefinitions/src/Serializer.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
index 2ff11ddbab..df4f2dff63 100644
--- a/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/Serializer.cpp
@@ -431,7 +431,7 @@ PolicySerializer::deserialize<AudioProfileTraits>(
std::string samplingRates = getXmlAttribute(cur, Attributes::samplingRates);
std::string format = getXmlAttribute(cur, Attributes::format);
std::string channels = getXmlAttribute(cur, Attributes::channelMasks);
- ChannelTraits::Collection channelsMask = channelMasksFromString(channels, ",");
+ ChannelTraits::Collection channelsMask = channelMasksFromString(channels, mChannelMasksSeparator.c_str());
//Some Foxconn devices have wrong earpiece channel mask, leading to no channel mask
if(channelsMask.size() == 1 && *channelsMask.begin() == AUDIO_CHANNEL_IN_MONO && isOutput) {
--
2.25.1

2
patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch
View File

@ -1,4 +1,4 @@
From 6a586c8d51eddc005f1215e73327321296c047fd Mon Sep 17 00:00:00 2001 From e42a02d1448c13fde0e1d7a326572d04f27fef14 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 5 Oct 2021 17:59:16 -0400 Date: Tue, 5 Oct 2021 17:59:16 -0400
Subject: [PATCH 01/28] Fallback to stupid autobrightness if brightness values Subject: [PATCH 01/28] Fallback to stupid autobrightness if brightness values

8
patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
View File

@ -1,4 +1,4 @@
From 19e1c2ec405a3a378fd80b86716d65692da7a1cd Mon Sep 17 00:00:00 2001 From 950264e8b5aa352a8d5663878a7ad6e5ac7d7865 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 28 Nov 2017 18:28:04 +0100 Date: Tue, 28 Nov 2017 18:28:04 +0100
Subject: [PATCH 02/28] Relax requirement for visible flag to sdcards Subject: [PATCH 02/28] Relax requirement for visible flag to sdcards
@ -13,7 +13,7 @@ Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
index 8727932a87f7..f58f952d19e2 100644 index 2f29c3cb4e7c..de92ad4d47ca 100644
--- a/services/core/java/com/android/server/StorageManagerService.java --- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -1582,7 +1582,8 @@ class StorageManagerService extends IStorageManager.Stub @@ -1582,7 +1582,8 @@ class StorageManagerService extends IStorageManager.Stub
@ -24,8 +24,8 @@ index 8727932a87f7..f58f952d19e2 100644
+ // Assume all SDs match this as well + // Assume all SDs match this as well
+ if (vol.disk.isAdoptable() || vol.disk.isSd()) { + if (vol.disk.isAdoptable() || vol.disk.isSd()) {
vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE; vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
} } else if (vol.disk.isSd()) {
vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
-- --
2.25.1 2.25.1

2
patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
View File

@ -1,4 +1,4 @@
From 52c14e64a80eede9b3e82afd54fd4e6cf5862cf1 Mon Sep 17 00:00:00 2001 From 439dea5fc58d5d67545f882c885586d6aa04e2dc Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 17 May 2018 20:28:35 +0200 Date: Thu, 17 May 2018 20:28:35 +0200
Subject: [PATCH 03/28] Don't crash if there is IR HAL is not declared Subject: [PATCH 03/28] Don't crash if there is IR HAL is not declared

2
patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch
View File

@ -1,4 +1,4 @@
From 33fb74d694502c95ee26f331ea308114f8506b90 Mon Sep 17 00:00:00 2001 From 3d3ef7ef4a0406ed5b3761ee934d172bfdbe02e7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 6 Aug 2018 12:49:00 +0200 Date: Mon, 6 Aug 2018 12:49:00 +0200
Subject: [PATCH 04/28] Show APN Settings for CDMA carriers Subject: [PATCH 04/28] Show APN Settings for CDMA carriers

4
patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch
View File

@ -1,4 +1,4 @@
From b9d12e89208f1b10efbf6d64b9c1b8613b6b336c Mon Sep 17 00:00:00 2001 From 114aa0bef17c9a6814d4424e8ed3b25512102c3d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 8 Nov 2018 23:04:03 +0100 Date: Thu, 8 Nov 2018 23:04:03 +0100
Subject: [PATCH 05/28] Re-order services so that it works even without qtaguid Subject: [PATCH 05/28] Re-order services so that it works even without qtaguid
@ -9,7 +9,7 @@ Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 9c664b6da4f2..8ebcfb667161 100644 index 0a85854b2af8..2b3b9b1572d7 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -878,6 +878,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { @@ -878,6 +878,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

8
patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch
View File

@ -1,4 +1,4 @@
From 073b07985a88b4ab54a9451503d58070de0f0721 Mon Sep 17 00:00:00 2001 From fec18df4c1900f54a9581569a27f44d4aa6689ce Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 24 Mar 2019 23:05:14 +0100 Date: Sun, 24 Mar 2019 23:05:14 +0100
Subject: [PATCH 06/28] Support samsung Pie and Q light hal Subject: [PATCH 06/28] Support samsung Pie and Q light hal
@ -10,13 +10,13 @@ Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6
2 files changed, 53 insertions(+) 2 files changed, 53 insertions(+)
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 81532bcba0ae..8ddc16aae3d7 100644 index 53401fd47178..59256cc73df1 100644
--- a/services/core/jni/Android.bp --- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp
@@ -184,6 +184,8 @@ cc_defaults { @@ -183,6 +183,8 @@ cc_defaults {
"android.system.suspend.control.internal-cpp",
"android.system.suspend@1.0", "android.system.suspend@1.0",
"service.incremental", "service.incremental",
"vendor.lineage.power-V1-cpp",
+ "vendor.samsung.hardware.light@2.0", + "vendor.samsung.hardware.light@2.0",
+ "vendor.samsung.hardware.light@3.0", + "vendor.samsung.hardware.light@3.0",
], ],

2
patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch
View File

@ -1,4 +1,4 @@
From 489e8a00a23c0dd6fbef5f1e69b2f7ed3fbc04d7 Mon Sep 17 00:00:00 2001 From 4d0b2ab189abeadc3802878d679ef1e6800c76da Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 12 Aug 2019 23:08:26 +0200 Date: Mon, 12 Aug 2019 23:08:26 +0200
Subject: [PATCH 07/28] Add support for samsung touch, physical and hover Subject: [PATCH 07/28] Add support for samsung touch, physical and hover

2
patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch
View File

@ -1,4 +1,4 @@
From e69df4088c108effd45e8741047ee1afd8ca2ce5 Mon Sep 17 00:00:00 2001 From bb2490310ccca71a4a0b69858d0a274eefebd3d7 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 5 Apr 2020 16:32:46 +0200 Date: Sun, 5 Apr 2020 16:32:46 +0200
Subject: [PATCH 08/28] Always allow overriding the number of work profiles Subject: [PATCH 08/28] Always allow overriding the number of work profiles

2
patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch
View File

@ -1,4 +1,4 @@
From 901baaf78da74754054309406fb5211170a38552 Mon Sep 17 00:00:00 2001 From 86ba18dfced8787826c34bb28d7ed83b35b8d3f4 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 6 Jun 2020 18:21:56 +0200 Date: Sat, 6 Jun 2020 18:21:56 +0200
Subject: [PATCH 09/28] HOME deserves to wake-up devices just as well as back Subject: [PATCH 09/28] HOME deserves to wake-up devices just as well as back

2
patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch
View File

@ -1,4 +1,4 @@
From 14e1ced9fe14016d081618bb41a451227cd538d8 Mon Sep 17 00:00:00 2001 From 1b7f27efb7af8a4c9f49a1e504f5b4d2530e1c85 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 29 Sep 2020 22:39:47 +0200 Date: Tue, 29 Sep 2020 22:39:47 +0200
Subject: [PATCH 10/28] Some devices have proximity sensor reporting NaN as max Subject: [PATCH 10/28] Some devices have proximity sensor reporting NaN as max

4
patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch
View File

@ -1,4 +1,4 @@
From f8fb9e614a976c475edc26770347f9eee623d85c Mon Sep 17 00:00:00 2001 From 5f849729380e68e0317c89da35c23b98df916748 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 29 Sep 2020 22:40:10 +0200 Date: Tue, 29 Sep 2020 22:40:10 +0200
Subject: [PATCH 11/28] Fix brightness range not being complete on Samsung Subject: [PATCH 11/28] Fix brightness range not being complete on Samsung
@ -15,7 +15,7 @@ Change-Id: I4d97cbc32490949e83272b81ec6320a5483310b1
1 file changed, 4 insertions(+), 2 deletions(-) 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 62d9991254bd..24932bd4d201 100644 index 5ac1f31bf817..06cd0ac979e9 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java --- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -1040,9 +1040,11 @@ public final class PowerManagerService extends SystemService @@ -1040,9 +1040,11 @@ public final class PowerManagerService extends SystemService

2
patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch
View File

@ -1,4 +1,4 @@
From ccb4d4cf65dcb79d237caa9192bb863ef5809edd Mon Sep 17 00:00:00 2001 From af86daa9d8bd70690e9b50c2e1e23e5d52bc662d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 25 Oct 2020 23:57:26 +0100 Date: Sun, 25 Oct 2020 23:57:26 +0100
Subject: [PATCH 12/28] Re-implement fnmatch-like behaviour for RRO java-side Subject: [PATCH 12/28] Re-implement fnmatch-like behaviour for RRO java-side

2
patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch
View File

@ -1,4 +1,4 @@
From 924e19514d9bc0c67c64560fba9d7fc3432e8981 Mon Sep 17 00:00:00 2001 From 8a1571889ec702ae794f006af91d6d662042cc0a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 6 Dec 2020 12:20:08 +0100 Date: Sun, 6 Dec 2020 12:20:08 +0100
Subject: [PATCH 13/28] Make rounded corners padding overridable with Subject: [PATCH 13/28] Make rounded corners padding overridable with

2
patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch
View File

@ -1,4 +1,4 @@
From dd87ec1187b8be38995b734dbdfe3598dfd59cdb Mon Sep 17 00:00:00 2001 From 4a0779e7ee51291bc635cc2aa414ef6252503902 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 11 Dec 2020 14:41:09 +0100 Date: Fri, 11 Dec 2020 14:41:09 +0100
Subject: [PATCH 14/28] Remove useless notification about "console" service Subject: [PATCH 14/28] Remove useless notification about "console" service

2
patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch
View File

@ -1,4 +1,4 @@
From bdffa8303310e05d4fba777d5f1e00b62d20db19 Mon Sep 17 00:00:00 2001 From f72b62ec62e70b907c02b7af6382e36f45777509 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net> From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 21:24:12 +0800 Date: Wed, 16 Dec 2020 21:24:12 +0800
Subject: [PATCH 15/28] Revert "Remove unused SystemProperties.set" Subject: [PATCH 15/28] Revert "Remove unused SystemProperties.set"

2
patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch
View File

@ -1,4 +1,4 @@
From 6384008d3e04db21fe384cba9879b915cded98ab Mon Sep 17 00:00:00 2001 From 6a140ec75ff6b13b6ec397119ee46774e38f3333 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net> From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 13:46:15 +0800 Date: Wed, 16 Dec 2020 13:46:15 +0800
Subject: [PATCH 16/28] TelephonyManager: bring back getNetworkClass() Subject: [PATCH 16/28] TelephonyManager: bring back getNetworkClass()

2
patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch
View File

@ -1,4 +1,4 @@
From 3026abf6ca577e885c2481c39826b16104a49ac2 Mon Sep 17 00:00:00 2001 From 8f25adf7351f187e5c1a6c0f3607f14b6e272bd7 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net> From: Peter Cai <peter@typeblog.net>
Date: Wed, 16 Dec 2020 21:26:45 +0800 Date: Wed, 16 Dec 2020 21:26:45 +0800
Subject: [PATCH 17/28] TelephonyManager: add API annotations for Subject: [PATCH 17/28] TelephonyManager: add API annotations for

2
patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch
View File

@ -1,4 +1,4 @@
From 78a5652a8d86f51f479ced7b08864fe71f630905 Mon Sep 17 00:00:00 2001 From 2d0a8597409cd7a31d7718c1c9d6ebd2cdaa1c0d Mon Sep 17 00:00:00 2001
From: Alberto Ponces <ponces26@gmail.com> From: Alberto Ponces <ponces26@gmail.com>
Date: Tue, 2 Feb 2021 10:20:51 +0000 Date: Tue, 2 Feb 2021 10:20:51 +0000
Subject: [PATCH 18/28] Fix Wakelock issue Subject: [PATCH 18/28] Fix Wakelock issue

2
patches_treble_phh/platform_frameworks_base/0019-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch
View File

@ -1,4 +1,4 @@
From 2cb4389377b69c5e53101536333838c6aa63d4fa Mon Sep 17 00:00:00 2001 From 243d10a369e231ca4f239d75c518a72bc1a55933 Mon Sep 17 00:00:00 2001
From: Arne Coucheron <arco68@gmail.com> From: Arne Coucheron <arco68@gmail.com>
Date: Thu, 5 Nov 2020 05:38:44 +0100 Date: Thu, 5 Nov 2020 05:38:44 +0100
Subject: [PATCH 19/28] SystemUI: Use AVCProfileMain for screen recorder Subject: [PATCH 19/28] SystemUI: Use AVCProfileMain for screen recorder

2
patches_treble_phh/platform_frameworks_base/0020-Automatically-detect-pick-up-sensor-so-that-an-overl.patch
View File

@ -1,4 +1,4 @@
From 357f0fac32fc59b8f6349febd3a65f2ffb820279 Mon Sep 17 00:00:00 2001 From 3ae48d5109ac89634f9a7f96a8555d96025050c8 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 20 Mar 2021 14:31:01 +0100 Date: Sat, 20 Mar 2021 14:31:01 +0100
Subject: [PATCH 20/28] Automatically detect pick up sensor, so that an overlay Subject: [PATCH 20/28] Automatically detect pick up sensor, so that an overlay

2
patches_treble_phh/platform_frameworks_base/0021-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch
View File

@ -1,4 +1,4 @@
From f4f5e6173024f2057f4d4ffcdc77028d03b004e2 Mon Sep 17 00:00:00 2001 From 5b9aa5db4dc782ed9a6506cda78277d87f81ef31 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 23 Mar 2021 19:43:26 +0100 Date: Tue, 23 Mar 2021 19:43:26 +0100
Subject: [PATCH 21/28] Catch broken mainBuiltInDisplayCutoutRectApproximation Subject: [PATCH 21/28] Catch broken mainBuiltInDisplayCutoutRectApproximation

2
patches_treble_phh/platform_frameworks_base/0022-backlight-Fix-backlight-control-on-Galaxy-S9.patch
View File

@ -1,4 +1,4 @@
From 0935d80aa90b9575b77bd55a37432a5f4a6c3747 Mon Sep 17 00:00:00 2001 From 69316504d686f4365303f60a395634d5a9878725 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 24 Mar 2018 08:01:48 +0100 Date: Sat, 24 Mar 2018 08:01:48 +0100
Subject: [PATCH 22/28] backlight: Fix backlight control on Galaxy S9(+) Subject: [PATCH 22/28] backlight: Fix backlight control on Galaxy S9(+)

6
patches_treble_phh/platform_frameworks_base/0023-Add-support-for-app-signature-spoofing.patch
View File

@ -1,4 +1,4 @@
From 7b0c25ae3dfe6af5d9d9a2b2518964f7c5f034bf Mon Sep 17 00:00:00 2001 From 3c7d6c5106eea744e08250998ce3d60af7c9b306 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev> From: Danny Lin <danny@kdrag0n.dev>
Date: Sat, 16 Oct 2021 05:27:57 -0700 Date: Sat, 16 Oct 2021 05:27:57 -0700
Subject: [PATCH 23/28] Add support for app signature spoofing Subject: [PATCH 23/28] Add support for app signature spoofing
@ -56,10 +56,10 @@ index 1de47b548a5c..52c7ea2e1321 100644
field public static final String MICROPHONE = "android.permission-group.MICROPHONE"; field public static final String MICROPHONE = "android.permission-group.MICROPHONE";
field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES"; field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 76b8547cea2a..8bd3206d1e3a 100644 index a006db9d8373..8c88f2d3dcba 100644
--- a/core/res/AndroidManifest.xml --- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml
@@ -3199,6 +3199,21 @@ @@ -3202,6 +3202,21 @@
android:description="@string/permdesc_getPackageSize" android:description="@string/permdesc_getPackageSize"
android:protectionLevel="normal" /> android:protectionLevel="normal" />

2
patches_treble_phh/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch
View File

@ -1,4 +1,4 @@
From 7003808f45a75893726d4073da9132c314091e98 Mon Sep 17 00:00:00 2001 From afdd9f16ebf1993e982389260129fed10c3820fa Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com> From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 4 Sep 2021 08:26:30 +0000 Date: Sat, 4 Sep 2021 08:26:30 +0000
Subject: [PATCH 24/28] Revert "Switch long-press power behavior in AOSP." Subject: [PATCH 24/28] Revert "Switch long-press power behavior in AOSP."

4
patches_treble_phh/platform_frameworks_base/0025-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch
View File

@ -1,4 +1,4 @@
From 72faf5ce1446d48e39961177519c92359e066312 Mon Sep 17 00:00:00 2001 From af7498ac0f380fd576e8c821d4a091ab242f20ba Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 17 Dec 2021 17:16:14 -0500 Date: Fri, 17 Dec 2021 17:16:14 -0500
Subject: [PATCH 25/28] Reduce the size of udfps enroll progress bar. Some Subject: [PATCH 25/28] Reduce the size of udfps enroll progress bar. Some
@ -11,7 +11,7 @@ Change-Id: I1609ad9ca316293dcaaf07f7e681d11aadfcd29c
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index dbbb54f7ad6e..d0098b32f384 100644 index b2ccacd5fe42..ebf7b8407727 100644
--- a/packages/SystemUI/res/values/config.xml --- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml
@@ -637,7 +637,7 @@ @@ -637,7 +637,7 @@

2
patches_treble_phh/platform_frameworks_base/0026-Add-UDFPS-support-for-various-devices.patch
View File

@ -1,4 +1,4 @@
From 380896691e59acbc1af203a2433adaba68c1b5ee Mon Sep 17 00:00:00 2001 From 3c5f40c68535cf981e0d891fa368910ccf9a301a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 19 Dec 2021 17:08:22 -0500 Date: Sun, 19 Dec 2021 17:08:22 -0500
Subject: [PATCH 26/28] Add UDFPS support for various devices Subject: [PATCH 26/28] Add UDFPS support for various devices

2
patches_treble_phh/platform_frameworks_base/0027-Dynamically-resize-boot-animation-to-match-screen-si.patch
View File

@ -1,4 +1,4 @@
From 8bee76c6e7f4524183ea134f59fd0254f958e07e Mon Sep 17 00:00:00 2001 From 901626c91714a65086a7a007290964f60da8464e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Dec 2021 15:01:41 -0500 Date: Mon, 20 Dec 2021 15:01:41 -0500
Subject: [PATCH 27/28] Dynamically resize boot animation to match screen size Subject: [PATCH 27/28] Dynamically resize boot animation to match screen size

8
patches_treble_phh/platform_frameworks_base/0028-Once-we-integrate-Samsung-Power-hal-in-libpowermanag.patch
View File

@ -1,4 +1,4 @@
From 16f900d9c0342636db048c22685d2a104a2a4e1f Mon Sep 17 00:00:00 2001 From 4be34967d45c4c8198be53c0190fa5b12b5cbb6e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me> From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 27 Dec 2021 17:57:11 -0500 Date: Mon, 27 Dec 2021 17:57:11 -0500
Subject: [PATCH 28/28] Once we integrate Samsung Power hal in libpowermanager, Subject: [PATCH 28/28] Once we integrate Samsung Power hal in libpowermanager,
@ -11,11 +11,11 @@ Change-Id: I9084f64e505009abe9420d28b44199605cee52d8
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 8ddc16aae3d7..806b92bcbdab 100644 index 59256cc73df1..17736c3623c9 100644
--- a/services/core/jni/Android.bp --- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp
@@ -186,6 +186,7 @@ cc_defaults { @@ -185,6 +185,7 @@ cc_defaults {
"vendor.lineage.power-V1-cpp", "service.incremental",
"vendor.samsung.hardware.light@2.0", "vendor.samsung.hardware.light@2.0",
"vendor.samsung.hardware.light@3.0", "vendor.samsung.hardware.light@3.0",
+ "vendor.samsung.hardware.miscpower@2.0", + "vendor.samsung.hardware.miscpower@2.0",

Some files were not shown because too many files have changed in this diff Show More