diff --git a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch new file mode 100644 index 0000000..051a38f --- /dev/null +++ b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch @@ -0,0 +1,128 @@ +From e37d16ac9d6d84412f64243dee1c48d8b1eb6ed5 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Thu, 13 Jan 2022 14:22:24 +0000 +Subject: [PATCH 01/21] Add SPenPointerOverlay + +Toggle this overlay with property "persist.ui.spen.pointer" + +Change-Id: I21f7e05cf8ebd74c950dfb20cf7eee99bfe22988 +--- + packages/overlays/Android.mk | 3 +- + .../overlays/SPenPointerOverlay/Android.bp | 28 ++++++++++++++++++ + .../SPenPointerOverlay/AndroidManifest.xml | 23 ++++++++++++++ + .../sem_pointer_spot_hovering_spen.png | Bin 0 -> 411 bytes + .../res/drawable/pointer_arrow_icon.xml | 5 ++++ + 5 files changed, 58 insertions(+), 1 deletion(-) + create mode 100644 packages/overlays/SPenPointerOverlay/Android.bp + create mode 100644 packages/overlays/SPenPointerOverlay/AndroidManifest.xml + create mode 100644 packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png + create mode 100644 packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml + +diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk +index 928892c60e47..3a114bc8ec79 100644 +--- a/packages/overlays/Android.mk ++++ b/packages/overlays/Android.mk +@@ -31,7 +31,8 @@ LOCAL_REQUIRED_MODULES := \ + NavigationBarModeGesturalOverlayNarrowBack \ + NavigationBarModeGesturalOverlayWideBack \ + NavigationBarModeGesturalOverlayExtraWideBack \ +- OneHandedModeGesturalOverlay \ ++ OneHandedModeGesturalOverlay \ ++ SPenPointerOverlay \ + preinstalled-packages-platform-overlays.xml + + include $(BUILD_PHONY_PACKAGE) +diff --git a/packages/overlays/SPenPointerOverlay/Android.bp b/packages/overlays/SPenPointerOverlay/Android.bp +new file mode 100644 +index 000000000000..7632ebd43ef6 +--- /dev/null ++++ b/packages/overlays/SPenPointerOverlay/Android.bp +@@ -0,0 +1,28 @@ ++// ++// Copyright 2021, The Android Open Source Project ++// ++// Licensed under the Apache License, Version 2.0 (the "License"); ++// you may not use this file except in compliance with the License. ++// You may obtain a copy of the License at ++// ++// http://www.apache.org/licenses/LICENSE-2.0 ++// ++// Unless required by applicable law or agreed to in writing, software ++// distributed under the License is distributed on an "AS IS" BASIS, ++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++// See the License for the specific language governing permissions and ++// limitations under the License. ++// ++package { ++ // See: http://go/android-license-faq ++ // A large-scale-change added 'default_applicable_licenses' to import ++ // all of the 'license_kinds' from "frameworks_base_license" ++ // to get the below license kinds: ++ // SPDX-license-identifier-Apache-2.0 ++ default_applicable_licenses: ["frameworks_base_license"], ++} ++ ++runtime_resource_overlay { ++ name: "SPenPointerOverlay", ++ product_specific: true, ++} +diff --git a/packages/overlays/SPenPointerOverlay/AndroidManifest.xml b/packages/overlays/SPenPointerOverlay/AndroidManifest.xml +new file mode 100644 +index 000000000000..b785214f854b +--- /dev/null ++++ b/packages/overlays/SPenPointerOverlay/AndroidManifest.xml +@@ -0,0 +1,23 @@ ++ ++ ++ ++ ++ +diff --git a/packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png b/packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png +new file mode 100644 +index 0000000000000000000000000000000000000000..b73246c80a95e0bceeb8c09aacd2653722fca2d2 +GIT binary patch +literal 411 +zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TG?EyX^u0VPYDww}y>9XB>H{O1* +z{q+Z+%%XMcH{QCp_4%7Ek6&zi^&Z52_8N#bKYY6T$G`bYmOylGdHNEl2EyKW`#w-H +zMEkav?|=xXa@&iyKv|#(o9;XSGJv*hefA2d9ViRrHpmHroTOV4wkZ<5N +zBf!g`Yhiojq)$5MjpwPIIqY#_(VA78COitTt~#=3 ++ +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0001-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch similarity index 89% rename from patches_platform/frameworks_base/0001-Disable-vendor-mismatch-warning.patch rename to patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch index f45b761..3038e8d 100644 --- a/patches_platform/frameworks_base/0001-Disable-vendor-mismatch-warning.patch +++ b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch @@ -1,7 +1,7 @@ -From 5c49797b6d93903bdfc4a6938eb18657f3525570 Mon Sep 17 00:00:00 2001 +From 6379c3431defb061fbc793982c1ba88b9d475e99 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 -Subject: [PATCH 01/22] Disable vendor mismatch warning +Subject: [PATCH 02/21] Disable vendor mismatch warning Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b --- @@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -index 08f3b1a8c6e0..d0387cc38d3d 100644 +index 5d0d182230e1..789968e19ab6 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -@@ -5499,20 +5499,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { +@@ -5508,20 +5508,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } if (!Build.isBuildConsistent()) { diff --git a/patches_platform/frameworks_base/0002-UI-Adjust-default-navbar-layouts.patch b/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch similarity index 94% rename from patches_platform/frameworks_base/0002-UI-Adjust-default-navbar-layouts.patch rename to patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch index be3f132..5b5b977 100644 --- a/patches_platform/frameworks_base/0002-UI-Adjust-default-navbar-layouts.patch +++ b/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch @@ -1,7 +1,7 @@ -From f4af00e6769797999721cbfe4673a7f2f0c76278 Mon Sep 17 00:00:00 2001 +From f7b8284284e3eb360a2403fc6782ccfff96bb99b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 16 Oct 2021 02:23:48 +0000 -Subject: [PATCH 02/22] UI: Adjust default navbar layouts +Subject: [PATCH 03/21] UI: Adjust default navbar layouts - Slightly tighten nodpi layout - Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify @@ -45,7 +45,7 @@ index 07b797a32428..000000000000 - left[.25W],back[.5WC];home;recent[.5WC],right[.25W] - diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml -index d274c917c26d..14276754e450 100644 +index d0098b32f384..62e4e27dca2a 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -350,7 +350,7 @@ diff --git a/patches_platform/frameworks_base/0003-UI-Disable-left-seascape-navigation-bar-optionally.patch b/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch similarity index 93% rename from patches_platform/frameworks_base/0003-UI-Disable-left-seascape-navigation-bar-optionally.patch rename to patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch index 61cd0d9..43bfa00 100644 --- a/patches_platform/frameworks_base/0003-UI-Disable-left-seascape-navigation-bar-optionally.patch +++ b/patches_platform/frameworks_base/0004-UI-Disable-left-seascape-navigation-bar-optionally.patch @@ -1,7 +1,7 @@ -From 07a09e5d704b6971a5c061ac65bb7d765e368dec Mon Sep 17 00:00:00 2001 +From b6ee471eb9405c82d26fc2cddc4c1446fa872467 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Fri, 9 Mar 2018 15:41:26 +0800 -Subject: [PATCH 03/22] UI: Disable left (seascape) navigation bar optionally +Subject: [PATCH 04/21] UI: Disable left (seascape) navigation bar optionally Toggle this behaviour with property "persist.ui.seascape.disable" @@ -45,10 +45,10 @@ index f1e1366404a2..f43bef8532b8 100644 for (int i = 0; i < group.getChildCount(); i++) { final View child = group.getChildAt(i); diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java -index d0457b08aa34..d165552d5ce8 100644 +index 21bca6ed6a53..b699c4e4f38d 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java -@@ -2352,9 +2352,10 @@ public class DisplayPolicy { +@@ -2388,9 +2388,10 @@ public class DisplayPolicy { @NavigationBarPosition int navigationBarPosition(int displayWidth, int displayHeight, int displayRotation) { if (navigationBarCanMove() && displayWidth > displayHeight) { diff --git a/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch similarity index 83% rename from patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch rename to patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch index 9d04383..a915fd4 100644 --- a/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch +++ b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch @@ -1,7 +1,7 @@ -From 58f4875f7b157bf408bd770a4131d5ee0c98f7da Mon Sep 17 00:00:00 2001 +From a8f18ce03f513f63f98c14b89918011e8e30ca93 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 10 Jan 2021 11:44:29 +0000 -Subject: [PATCH 04/22] UI: Disable wallpaper zoom +Subject: [PATCH 05/21] UI: Disable wallpaper zoom It does little more than inducing motion sickness @@ -11,10 +11,10 @@ Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index b7dfd49b7b78..08940c03b095 100644 +index 3ce1886fef6d..d8f280ddbf93 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -4768,7 +4768,7 @@ +@@ -4770,7 +4770,7 @@ diff --git a/patches_platform/frameworks_base/0005-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch similarity index 89% rename from patches_platform/frameworks_base/0005-UI-Increase-default-status-bar-height.patch rename to patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch index ca48814..4bc5b20 100644 --- a/patches_platform/frameworks_base/0005-UI-Increase-default-status-bar-height.patch +++ b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch @@ -1,7 +1,7 @@ -From 88c071a7385821219dbb90bc8475bece813e84c9 Mon Sep 17 00:00:00 2001 +From b2a7f77623b07fbea767605ba8ad5bbe6ed94c70 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 3 Jun 2020 01:31:34 +0000 -Subject: [PATCH 05/22] UI: Increase default status bar height +Subject: [PATCH 06/21] UI: Increase default status bar height Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 --- diff --git a/patches_platform/frameworks_base/0006-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0006-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch deleted file mode 100644 index ffffc5f..0000000 --- a/patches_platform/frameworks_base/0006-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch +++ /dev/null @@ -1,83 +0,0 @@ -From af017461178d08dcd0999b76d800e1e4f773c09b Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Tue, 6 Oct 2020 01:41:16 +0000 -Subject: [PATCH 06/22] UI: Revive navbar layout tuning via sysui_nav_bar - tunable - -Google keeps fixing what ain't broken. - -Change-Id: Ied7d7859e50fd0fcc346219964e747c5d5f4c352 ---- - .../NavigationBarInflaterView.java | 30 ++++++++++++++++++- - 1 file changed, 29 insertions(+), 1 deletion(-) - -diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java -index 4d9175b8db68..293ebb374241 100644 ---- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java -+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java -@@ -43,12 +43,13 @@ import com.android.systemui.navigationbar.buttons.ReverseLinearLayout; - import com.android.systemui.navigationbar.buttons.ReverseLinearLayout.ReverseRelativeLayout; - import com.android.systemui.recents.OverviewProxyService; - import com.android.systemui.shared.system.QuickStepContract; -+import com.android.systemui.tuner.TunerService; - - import java.io.PrintWriter; - import java.util.Objects; - - public class NavigationBarInflaterView extends FrameLayout -- implements NavigationModeController.ModeChangedListener { -+ implements NavigationModeController.ModeChangedListener, TunerService.Tunable { - - private static final String TAG = "NavBarInflater"; - -@@ -102,6 +103,8 @@ public class NavigationBarInflaterView extends FrameLayout - private OverviewProxyService mOverviewProxyService; - private int mNavBarMode = NAV_BAR_MODE_3BUTTON; - -+ private boolean mUsingCustomLayout; -+ - public NavigationBarInflaterView(Context context, AttributeSet attrs) { - super(context, attrs); - createInflaters(); -@@ -151,13 +154,38 @@ public class NavigationBarInflaterView extends FrameLayout - mNavBarMode = mode; - } - -+ @Override -+ protected void onAttachedToWindow() { -+ super.onAttachedToWindow(); -+ Dependency.get(TunerService.class).addTunable(this, NAV_BAR_VIEWS); -+ } -+ - @Override - protected void onDetachedFromWindow() { - Dependency.get(NavigationModeController.class).removeListener(this); -+ Dependency.get(TunerService.class).removeTunable(this); - super.onDetachedFromWindow(); - } - -+ @Override -+ public void onTuningChanged(String key, String newValue) { -+ if (NAV_BAR_VIEWS.equals(key)) { -+ setNavigationBarLayout(newValue); -+ } -+ } -+ -+ public void setNavigationBarLayout(String layoutValue) { -+ if (!Objects.equals(mCurrentLayout, layoutValue)) { -+ mUsingCustomLayout = layoutValue != null; -+ clearViews(); -+ inflateLayout(layoutValue); -+ } -+ } -+ - public void onLikelyDefaultLayoutChange() { -+ // Don't override custom layouts -+ if (mUsingCustomLayout) return; -+ - // Reevaluate new layout - final String newValue = getDefaultLayout(); - if (!Objects.equals(mCurrentLayout, newValue)) { --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0007-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0007-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch new file mode 100644 index 0000000..da2b75d --- /dev/null +++ b/patches_platform/frameworks_base/0007-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -0,0 +1,64 @@ +From a77071568a33266c3f93db359d865eddd2b38313 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Tue, 6 Oct 2020 01:41:16 +0000 +Subject: [PATCH 07/21] UI: Revive navbar layout tuning via sysui_nav_bar + tunable + +Google keeps fixing what ain't broken. + +Change-Id: Ied7d7859e50fd0fcc346219964e747c5d5f4c352 +--- + .../navigationbar/NavigationBarInflaterView.java | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java +index c8bc143f0bd8..fab079b91608 100644 +--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java ++++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarInflaterView.java +@@ -118,6 +118,7 @@ public class NavigationBarInflaterView extends FrameLayout + + private boolean mInverseLayout; + private boolean mIsHintEnabled; ++ private boolean mUsingCustomLayout; + + public NavigationBarInflaterView(Context context, AttributeSet attrs) { + super(context, attrs); +@@ -177,6 +178,7 @@ public class NavigationBarInflaterView extends FrameLayout + super.onAttachedToWindow(); + Dependency.get(TunerService.class).addTunable(this, NAV_BAR_INVERSE); + Dependency.get(TunerService.class).addTunable(this, KEY_NAVIGATION_HINT); ++ Dependency.get(TunerService.class).addTunable(this, NAV_BAR_VIEWS); + } + + @Override +@@ -195,6 +197,8 @@ public class NavigationBarInflaterView extends FrameLayout + mIsHintEnabled = TunerService.parseIntegerSwitch(newValue, true); + updateHint(); + onLikelyDefaultLayoutChange(); ++ } else if (NAV_BAR_VIEWS.equals(key)) { ++ setNavigationBarLayout(newValue); + } + } + +@@ -204,7 +208,18 @@ public class NavigationBarInflaterView extends FrameLayout + updateLayoutInversion(); + } + ++ public void setNavigationBarLayout(String layoutValue) { ++ if (!Objects.equals(mCurrentLayout, layoutValue)) { ++ mUsingCustomLayout = layoutValue != null; ++ clearViews(); ++ inflateLayout(layoutValue); ++ } ++ } ++ + public void onLikelyDefaultLayoutChange() { ++ // Don't override custom layouts ++ if (mUsingCustomLayout) return; ++ + // Reevaluate new layout + final String newValue = getDefaultLayout(); + if (!Objects.equals(mCurrentLayout, newValue)) { +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0007-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0008-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch similarity index 95% rename from patches_platform/frameworks_base/0007-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch rename to patches_platform/frameworks_base/0008-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch index 9143407..c86e180 100644 --- a/patches_platform/frameworks_base/0007-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch +++ b/patches_platform/frameworks_base/0008-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -1,7 +1,7 @@ -From 3da8e7d5f61c024dd70a311f9b67622f419c07a0 Mon Sep 17 00:00:00 2001 +From 064121d33cea08c574f5bd80b10bd3b3721241cc Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 26 Apr 2020 08:56:13 +0000 -Subject: [PATCH 07/22] UI: Use SNAP_FIXED_RATIO for multi-window globally +Subject: [PATCH 08/21] UI: Use SNAP_FIXED_RATIO for multi-window globally Enables multiple snap targets under landscape for phone UI @@ -78,10 +78,10 @@ index 34b6a54be493..3921c9edfeac 100644 Only applies if the device display is not square. --> false diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 08940c03b095..1319c26bb1be 100644 +index d8f280ddbf93..3a62b51d3cbc 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -3529,7 +3529,7 @@ +@@ -3531,7 +3531,7 @@ 1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio) 2 - 1 snap target: 1:1 --> diff --git a/patches_platform/frameworks_base/0008-UI-Unblock-alarm-status-bar-icon.patch b/patches_platform/frameworks_base/0009-UI-Unblock-alarm-status-bar-icon.patch similarity index 85% rename from patches_platform/frameworks_base/0008-UI-Unblock-alarm-status-bar-icon.patch rename to patches_platform/frameworks_base/0009-UI-Unblock-alarm-status-bar-icon.patch index cbb3631..e2cb231 100644 --- a/patches_platform/frameworks_base/0008-UI-Unblock-alarm-status-bar-icon.patch +++ b/patches_platform/frameworks_base/0009-UI-Unblock-alarm-status-bar-icon.patch @@ -1,7 +1,7 @@ -From 186e9e99567c3961a63535ae2b04aa172cfc1734 Mon Sep 17 00:00:00 2001 +From 2e11990cb2b10f0fe3c87273d76b3875da3b2e8f Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 14 Oct 2021 15:45:24 +0000 -Subject: [PATCH 08/22] UI: Unblock alarm status bar icon +Subject: [PATCH 09/21] UI: Unblock alarm status bar icon That's very Zen of you, Google... @@ -12,10 +12,10 @@ Change-Id: I2c9f91f47bb1e324a20c13d588dcdbbca91dc12e 2 files changed, 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java -index 6a171ceff1ed..2c1321f1c013 100644 +index 2e40af4fab2a..f8c79ceabf2e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragment.java -@@ -158,7 +158,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue +@@ -162,7 +162,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } mDarkIconManager = new DarkIconManager(view.findViewById(R.id.statusIcons), mFeatureFlags); mDarkIconManager.setShouldLog(true); @@ -24,10 +24,10 @@ index 6a171ceff1ed..2c1321f1c013 100644 mDarkIconManager.setBlockList(mBlockedIcons); mStatusBarIconController.addIconGroup(mDarkIconManager); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -index f9c6ebbd26e3..7b4dc47a7b48 100644 +index a32e7c4765ef..efc02548763a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -@@ -206,7 +206,6 @@ public class KeyguardStatusBarView extends RelativeLayout implements +@@ -203,7 +203,6 @@ public class KeyguardStatusBarView extends RelativeLayout implements // Set hidden status bar items private void loadBlockList() { Resources r = getResources(); diff --git a/patches_platform/frameworks_base/0009-core-Remove-default-aspect-ratio-limit-for-old-apps.patch b/patches_platform/frameworks_base/0009-core-Remove-default-aspect-ratio-limit-for-old-apps.patch deleted file mode 100644 index f39c80a..0000000 --- a/patches_platform/frameworks_base/0009-core-Remove-default-aspect-ratio-limit-for-old-apps.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1ec1cdc8f12227b0612d258ee110432ed954dde1 Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Tue, 3 Nov 2020 22:38:49 -0800 -Subject: [PATCH 09/22] core: Remove default aspect ratio limit for old apps -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -I have never encountered a single app that this aspect ratio limit is -actually helpful for. Most legacy apps are able to cope with longer -aspect ratios fine — perhaps not optimally, but it looks better than -having a big black box at the bottom of the screen. - -Instead of limiting older apps' screen space unconditionally or exposing -it in Settings, remove the limit entirely so the user doesn't have to go -through the trouble to begin with. Note that apps explicitly declaring a -shorter aspect ratio will still get their constraint satisfied. - -Change-Id: Ic415288b24129a634476b5cc01a6f202588f4b89 ---- - core/java/android/content/pm/PackageParser.java | 6 ++---- - .../android/content/pm/parsing/ParsingPackageUtils.java | 5 ++--- - 2 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java -index 9379a634afa8..6bf772b008a7 100644 ---- a/core/java/android/content/pm/PackageParser.java -+++ b/core/java/android/content/pm/PackageParser.java -@@ -4672,10 +4672,8 @@ public class PackageParser { - * ratio set. - */ - private void setMaxAspectRatio(Package owner) { -- // Default to (1.86) 16.7:9 aspect ratio for pre-O apps and unset for O and greater. -- // NOTE: 16.7:9 was the max aspect ratio Android devices can support pre-O per the CDD. -- float maxAspectRatio = owner.applicationInfo.targetSdkVersion < O -- ? DEFAULT_PRE_O_MAX_ASPECT_RATIO : 0; -+ // Start at an unlimited aspect ratio unless we get a more restrictive one -+ float maxAspectRatio = 0; - - if (owner.applicationInfo.maxAspectRatio != 0) { - // Use the application max aspect ration as default if set. -diff --git a/core/java/android/content/pm/parsing/ParsingPackageUtils.java b/core/java/android/content/pm/parsing/ParsingPackageUtils.java -index dce242c9d87c..5ea07db54eb7 100644 ---- a/core/java/android/content/pm/parsing/ParsingPackageUtils.java -+++ b/core/java/android/content/pm/parsing/ParsingPackageUtils.java -@@ -2584,9 +2584,8 @@ public class ParsingPackageUtils { - * ratio set. - */ - private static void setMaxAspectRatio(ParsingPackage pkg) { -- // Default to (1.86) 16.7:9 aspect ratio for pre-O apps and unset for O and greater. -- // NOTE: 16.7:9 was the max aspect ratio Android devices can support pre-O per the CDD. -- float maxAspectRatio = pkg.getTargetSdkVersion() < O ? DEFAULT_PRE_O_MAX_ASPECT_RATIO : 0; -+ // Start at an unlimited aspect ratio unless we get a more restrictive one -+ float maxAspectRatio = 0; - - float packageMaxAspectRatio = pkg.getMaxAspectRatio(); - if (packageMaxAspectRatio != 0) { --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch b/patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch new file mode 100644 index 0000000..d27522d --- /dev/null +++ b/patches_platform/frameworks_base/0010-core-Remove-old-app-target-SDK-dialog.patch @@ -0,0 +1,31 @@ +From 4247002faaf6768550040aec3132ca2015c6543c Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Tue, 3 Nov 2020 22:43:12 -0800 +Subject: [PATCH 10/21] core: Remove old app target SDK dialog + +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 +newer version if one existed. Sometimes, using an old app is necessary +for one reason or another, so remove this annoyance and let the user use +their old app in peace. + +Change-Id: I1a3021f0f9bec1ab6ff7641776391e1bd4c3cc49 +--- + services/core/java/com/android/server/wm/AppWarnings.java | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/services/core/java/com/android/server/wm/AppWarnings.java b/services/core/java/com/android/server/wm/AppWarnings.java +index 994f07959f3b..6749ae78c09c 100644 +--- a/services/core/java/com/android/server/wm/AppWarnings.java ++++ b/services/core/java/com/android/server/wm/AppWarnings.java +@@ -168,7 +168,6 @@ class AppWarnings { + public void onStartActivity(ActivityRecord r) { + showUnsupportedCompileSdkDialogIfNeeded(r); + showUnsupportedDisplaySizeDialogIfNeeded(r); +- showDeprecatedTargetDialogIfNeeded(r); + } + + /** +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0010-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch b/patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch similarity index 83% rename from patches_platform/frameworks_base/0010-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch rename to patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch index 21c1147..96eeed6 100644 --- a/patches_platform/frameworks_base/0010-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch +++ b/patches_platform/frameworks_base/0011-SystemUI-Always-refresh-power-menu-on-UI-mode-change.patch @@ -1,7 +1,7 @@ -From c1d673a010c19018d37ec21c2bbed09480c4dce9 Mon Sep 17 00:00:00 2001 +From 5403541355fe9d511591a10850d4e141f038a30b Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:15 -0700 -Subject: [PATCH 10/22] SystemUI: Always refresh power menu on UI mode change +Subject: [PATCH 11/21] SystemUI: Always refresh power menu on UI mode change This is necessary for reliably theming the global actions dialog with dynamic colors and adapting it to light/dark themes. @@ -15,10 +15,10 @@ Change-Id: Id6f6623096ed231e841ca3794b47f8a0ab54dae6 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 -index 9ada54b9ef6f..1ae3b31fd836 100644 +index 65c520ef2ff4..43a1084540f6 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java -@@ -703,7 +703,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene +@@ -762,7 +762,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene @Override public void onUiModeChanged() { mContext.getTheme().applyStyle(mContext.getThemeResId(), true); diff --git a/patches_platform/frameworks_base/0011-SystemUI-Use-Monet-colors-for-power-menu.patch b/patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch similarity index 95% rename from patches_platform/frameworks_base/0011-SystemUI-Use-Monet-colors-for-power-menu.patch rename to patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch index 96adb89..ede66c3 100644 --- a/patches_platform/frameworks_base/0011-SystemUI-Use-Monet-colors-for-power-menu.patch +++ b/patches_platform/frameworks_base/0012-SystemUI-Use-Monet-colors-for-power-menu.patch @@ -1,7 +1,7 @@ -From 314462d52502de4c850b3e657bdca280679188e1 Mon Sep 17 00:00:00 2001 +From 19c047cf3be7c3bcd1254c0b62fa3e9d5d0ae733 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 9 Oct 2021 14:39:38 -0700 -Subject: [PATCH 11/22] SystemUI: Use Monet colors for power menu +Subject: [PATCH 12/21] SystemUI: Use Monet colors for power menu 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 diff --git a/patches_platform/frameworks_base/0012-Revert-Make-QS-always-use-dark-theme-colors.patch b/patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch similarity index 94% rename from patches_platform/frameworks_base/0012-Revert-Make-QS-always-use-dark-theme-colors.patch rename to patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch index aaba987..2387ffa 100644 --- a/patches_platform/frameworks_base/0012-Revert-Make-QS-always-use-dark-theme-colors.patch +++ b/patches_platform/frameworks_base/0013-Revert-Make-QS-always-use-dark-theme-colors.patch @@ -1,7 +1,7 @@ -From d6a215d67f767fe6a793dd66f5bf8dcd02f48d57 Mon Sep 17 00:00:00 2001 +From a3d2feb6e711e9a96cec4fa19276be18bdda118c Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Wed, 6 Oct 2021 18:40:30 -0700 -Subject: [PATCH 12/22] Revert "Make QS always use dark theme colors" +Subject: [PATCH 13/21] Revert "Make QS always use dark theme colors" This reverts commit d62f7249f9e3222da95ecf6816601c408aac6be5. diff --git a/patches_platform/frameworks_base/0013-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch b/patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch similarity index 91% rename from patches_platform/frameworks_base/0013-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch rename to patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch index e05654c..e99f525 100644 --- a/patches_platform/frameworks_base/0013-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch +++ b/patches_platform/frameworks_base/0014-Revert-Do-not-re-inflate-QS-and-SB-when-CONFIG_UI_MO.patch @@ -1,7 +1,7 @@ -From 1ed0fb3e67d9d1f41435e7e60b801837a83c2c64 Mon Sep 17 00:00:00 2001 +From aadd3892d31154fd43307f3ac1293b9a1ed011b6 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Wed, 6 Oct 2021 18:41:11 -0700 -Subject: [PATCH 13/22] Revert "Do not re-inflate QS and SB when +Subject: [PATCH 14/21] Revert "Do not re-inflate QS and SB when CONFIG_UI_MODE" This reverts commit 8a40ff855b86bc86e23367017002289920855a4e. diff --git a/patches_platform/frameworks_base/0014-SystemUI-Follow-light-dark-theme-in-quick-settings.patch b/patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch similarity index 86% rename from patches_platform/frameworks_base/0014-SystemUI-Follow-light-dark-theme-in-quick-settings.patch rename to patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch index b27f5a3..0ef0667 100644 --- a/patches_platform/frameworks_base/0014-SystemUI-Follow-light-dark-theme-in-quick-settings.patch +++ b/patches_platform/frameworks_base/0015-SystemUI-Follow-light-dark-theme-in-quick-settings.patch @@ -1,7 +1,7 @@ -From c0aadaca1ab833a13ecacc48cf5c458427f8f6b4 Mon Sep 17 00:00:00 2001 +From a9bd8968c9baae389fd4e5cc54d2c4403d603690 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:24:58 -0700 -Subject: [PATCH 14/22] SystemUI: Follow light/dark theme in quick settings +Subject: [PATCH 15/21] SystemUI: Follow light/dark theme in quick settings 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 @@ -25,15 +25,15 @@ https://twitter.com/kdrag0n/status/1445922541218922496 Change-Id: I3d45b72f0f119e100505409d178ab8f698993881 --- .../brightness_progress_full_drawable.xml | 2 +- - .../qs_footer_action_chip_background.xml | 8 +------- - .../qs_security_footer_background.xml | 3 +-- - packages/SystemUI/res/values-night/styles.xml | 12 +++++++++++ - packages/SystemUI/res/values/styles.xml | 10 +++++----- - .../systemui/privacy/OngoingPrivacyChip.kt | 4 ++-- + .../qs_footer_action_chip_background.xml | 8 +---- + .../qs_security_footer_background.xml | 3 +- + packages/SystemUI/res/values-night/styles.xml | 12 ++++++++ + packages/SystemUI/res/values/styles.xml | 10 +++---- + .../systemui/privacy/OngoingPrivacyChip.kt | 4 +-- .../systemui/qs/tileimpl/QSTileViewImpl.kt | 2 +- .../statusbar/phone/ScrimController.java | 2 +- - .../systemui/statusbar/phone/ScrimState.java | 20 +++++++++---------- - 9 files changed, 34 insertions(+), 29 deletions(-) + .../systemui/statusbar/phone/ScrimState.java | 30 +++++++++---------- + 9 files changed, 39 insertions(+), 34 deletions(-) diff --git a/packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml b/packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml index 4d9188c40822..1eae667c6e79 100644 @@ -176,7 +176,7 @@ index 27c129ad34c5..6bdf82a60e40 100644 mBehindAlpha = behindAlpha; if (mState == ScrimState.SHADE_LOCKED) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java -index 15b8c67fd4ba..577e33c3c8d6 100644 +index 15b8c67fd4ba..e81642f7d491 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimState.java @@ -88,7 +88,7 @@ public enum ScrimState { @@ -250,6 +250,39 @@ index 15b8c67fd4ba..577e33c3c8d6 100644 } } }, +@@ -290,27 +290,27 @@ public enum ScrimState { + mAnimateChange = !mLaunchingAffordanceWithPreview; + + mFrontTint = Color.TRANSPARENT; +- mBehindTint = Color.BLACK; +- mBubbleTint = Color.BLACK; ++ mBehindTint = Color.TRANSPARENT; ++ mBubbleTint = Color.TRANSPARENT; + mBlankScreen = false; + + if (previousState == ScrimState.AOD) { + // Set all scrims black, before they fade transparent. + updateScrimColor(mScrimInFront, 1f /* alpha */, Color.BLACK /* tint */); +- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK /* tint */); ++ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT /* tint */); + if (mScrimForBubble != null) { + updateScrimColor(mScrimForBubble, 1f /* alpha */, Color.BLACK /* tint */); + } + + // Scrims should still be black at the end of the transition. + mFrontTint = Color.BLACK; +- mBehindTint = Color.BLACK; ++ mBehindTint = Color.TRANSPARENT; + mBubbleTint = Color.BLACK; + mBlankScreen = true; + } + + if (mClipQsScrim) { +- updateScrimColor(mScrimBehind, 1f /* alpha */, Color.BLACK); ++ updateScrimColor(mScrimBehind, 1f /* alpha */, Color.TRANSPARENT); + } + + mAnimationDuration = ScrimController.ANIMATION_DURATION; @@ -468,4 +468,4 @@ public enum ScrimState { public void setClipQsScrim(boolean clipsQsScrim) { mClipQsScrim = clipsQsScrim; diff --git a/patches_platform/frameworks_base/0015-SystemUI-Initialize-QS-tiles-in-inactive-state.patch b/patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch similarity index 91% rename from patches_platform/frameworks_base/0015-SystemUI-Initialize-QS-tiles-in-inactive-state.patch rename to patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch index dd978bb..a5d7b40 100644 --- a/patches_platform/frameworks_base/0015-SystemUI-Initialize-QS-tiles-in-inactive-state.patch +++ b/patches_platform/frameworks_base/0016-SystemUI-Initialize-QS-tiles-in-inactive-state.patch @@ -1,7 +1,7 @@ -From a49d127bf72839cdbeb1bea6e1b7e21612ae91a9 Mon Sep 17 00:00:00 2001 +From 18493a29e0c14b70e112e2e4f9ced0eca413bad7 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:25:02 -0700 -Subject: [PATCH 15/22] SystemUI: Initialize QS tiles in inactive state +Subject: [PATCH 16/21] SystemUI: Initialize QS tiles in inactive state 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 diff --git a/patches_platform/frameworks_base/0016-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch b/patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch similarity index 98% rename from patches_platform/frameworks_base/0016-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch rename to patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch index 0e1533e..7e87a12 100644 --- a/patches_platform/frameworks_base/0016-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch +++ b/patches_platform/frameworks_base/0017-SystemUI-Add-dual-tone-light-and-dark-themes-for-QS.patch @@ -1,7 +1,7 @@ -From 798b251cd278e00d214e99f4d35bdd81140e973b Mon Sep 17 00:00:00 2001 +From 2d092c73ebc947960e09ba5a1a1a884224206c4b Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:25:08 -0700 -Subject: [PATCH 16/22] SystemUI: Add dual-tone light and dark themes for QS +Subject: [PATCH 17/21] SystemUI: Add dual-tone light and dark themes for QS Google's dual-tone QS design where the notification panel has a semantically higher elevation adds depth to the notification+QS shade, diff --git a/patches_platform/frameworks_base/0017-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch b/patches_platform/frameworks_base/0018-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch similarity index 94% rename from patches_platform/frameworks_base/0017-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch rename to patches_platform/frameworks_base/0018-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch index d113ea2..d82ef86 100644 --- a/patches_platform/frameworks_base/0017-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch +++ b/patches_platform/frameworks_base/0018-SystemUI-Remove-nav-bar-background-in-QS-customizer.patch @@ -1,7 +1,7 @@ -From 02806d68e92827a0799395338d3b29c055e176ef Mon Sep 17 00:00:00 2001 +From e9e767ef589530c378b9233ae3d3c5aa37f500ec Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:25:11 -0700 -Subject: [PATCH 17/22] SystemUI: Remove nav bar background in QS customizer +Subject: [PATCH 18/21] SystemUI: Remove nav bar background in QS customizer This looks outdated, since most apps are edge-to-edge nowadays. diff --git a/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0019-Paint-Enable-subpixel-text-positioning-by-default.patch similarity index 92% rename from patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch rename to patches_platform/frameworks_base/0019-Paint-Enable-subpixel-text-positioning-by-default.patch index 3ae7fdc..c3fd0e7 100644 --- a/patches_platform/frameworks_base/0018-Paint-Enable-subpixel-text-positioning-by-default.patch +++ b/patches_platform/frameworks_base/0019-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -1,7 +1,7 @@ -From 22f30f47048335c6a64a35ce68eafc640bfb40af Mon Sep 17 00:00:00 2001 +From 51ff74ab5ef8bc65f6bb3d6d436995bcbe7b8d89 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:50 -0700 -Subject: [PATCH 18/22] Paint: Enable subpixel text positioning by default +Subject: [PATCH 19/21] Paint: Enable subpixel text positioning by default On desktop Linux, subpixel text positioning is necessary to avoid kerning issues, and Android is no different. Even though most phone diff --git a/patches_platform/frameworks_base/0020-SystemUI-Expose-legacy-Wi-Fi-and-cellular-data-QS-ti.patch b/patches_platform/frameworks_base/0020-SystemUI-Expose-legacy-Wi-Fi-and-cellular-data-QS-ti.patch deleted file mode 100644 index 8caa6f1..0000000 --- a/patches_platform/frameworks_base/0020-SystemUI-Expose-legacy-Wi-Fi-and-cellular-data-QS-ti.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7850ab773ef48f6fddb166e1af10fce56ba06648 Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Sat, 16 Oct 2021 03:27:23 -0700 -Subject: [PATCH 20/22] SystemUI: Expose legacy Wi-Fi and cellular data QS - tiles - -We'll still use Android 12's unified internet settings and the Internet -tile by default, but expose the legacy Wi-Fi and cellular data tiles so -that users can add them with the QS customizer. - -Change-Id: I65902b38c99f61782bd9aa0ea604848fbd068bda ---- - packages/SystemUI/res/values/config.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml -index 14276754e450..c99ab8bf5e9a 100644 ---- a/packages/SystemUI/res/values/config.xml -+++ b/packages/SystemUI/res/values/config.xml -@@ -107,7 +107,7 @@ - - - -- internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness -+ internet,wifi,cell,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness - - - --- -2.25.1 - diff --git a/patches_platform/frameworks_base/0019-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch b/patches_platform/frameworks_base/0020-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch similarity index 88% rename from patches_platform/frameworks_base/0019-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch rename to patches_platform/frameworks_base/0020-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch index e34e523..840d3a2 100644 --- a/patches_platform/frameworks_base/0019-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch +++ b/patches_platform/frameworks_base/0020-SystemUI-Fix-QS-status-font-weight-mismatch-in-dark-.patch @@ -1,7 +1,7 @@ -From 00373ab57fc28c8f1e5320748879d99b30d49112 Mon Sep 17 00:00:00 2001 +From 4cafce4750d1834d48d806623d84f9625c0ba3a9 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:02:12 -0700 -Subject: [PATCH 19/22] SystemUI: Fix QS status font weight mismatch in dark +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 diff --git a/patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch b/patches_platform/frameworks_base/0021-Fix-QS-clock-being-white-on-light-theme.patch similarity index 93% rename from patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch rename to patches_platform/frameworks_base/0021-Fix-QS-clock-being-white-on-light-theme.patch index 16aedda..d4ccb69 100644 --- a/patches_platform/frameworks_base/0022-Fix-QS-clock-being-white-on-light-theme.patch +++ b/patches_platform/frameworks_base/0021-Fix-QS-clock-being-white-on-light-theme.patch @@ -1,13 +1,15 @@ -From 00463f495ad23afddbf5bc0b4c227e63d09bc8e4 Mon Sep 17 00:00:00 2001 +From d219b7a9aefd4a744e66ea331dc5ac127c9b3ab3 Mon Sep 17 00:00:00 2001 From: SagarMakhar Date: Sat, 6 Nov 2021 13:16:24 +0000 -Subject: [PATCH 22/22] Fix QS clock being white on light theme +Subject: [PATCH 21/21] Fix QS clock being white on light theme Steps to reproduce without this commit: - Turn off dark theme - Play a song and wait for media player to show in QS - Confirm clock text color is white +Signed-off-by: SagarMakhar +Change-Id: I62aeba57e1ce458c73752faa1c9d80d26a63f625 Signed-off-by: SagarMakhar --- .../systemui/qs/QuickStatusBarHeaderController.java | 13 ------------- diff --git a/patches_platform/frameworks_base/0021-SystemUI-Allow-Wi-Fi-cell-tiles-to-co-exist-with-pro.patch b/patches_platform/frameworks_base/0021-SystemUI-Allow-Wi-Fi-cell-tiles-to-co-exist-with-pro.patch deleted file mode 100644 index 3f8ac5e..0000000 --- a/patches_platform/frameworks_base/0021-SystemUI-Allow-Wi-Fi-cell-tiles-to-co-exist-with-pro.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 6ec18b7fe383ba54de08df6d6d76b74361491ddd Mon Sep 17 00:00:00 2001 -From: Danny Lin -Date: Mon, 25 Oct 2021 19:32:33 -0700 -Subject: [PATCH 21/22] SystemUI: Allow Wi-Fi/cell tiles to co-exist with - provider model - -The dedicated Wi-Fi/cellular data QS tiles are partially working now -that we've exposed them in the list of tile options, but they're very -buggy and somewhat broken when the provider model (unified internet) is -enabled. - -Allow the tiles to co-exist with InternetTile and the provider model -(including both settings_provider_model and combined signal icons) by -always including QS icons in Wi-Fi/data indicator callbacks, and add -a new flag to indicate whether they should be shown in the internet -tile. - -Change-Id: I10af134b35dfabdb9275f1aca8ca8512e1db6d27 ---- - .../systemui/qs/tiles/InternetTile.java | 4 +- - .../policy/MobileSignalController.java | 32 ++++-------- - .../statusbar/policy/NetworkController.java | 10 +++- - .../policy/WifiSignalController.java | 49 +++++++------------ - 4 files changed, 37 insertions(+), 58 deletions(-) - -diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java -index cc9e7485dcff..4bf8053017f1 100644 ---- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java -+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java -@@ -255,7 +255,7 @@ public class InternetTile extends QSTileImpl { - Log.d(TAG, "setWifiIndicators: " + indicators); - } - mWifiInfo.mEnabled = indicators.enabled; -- if (indicators.qsIcon == null) { -+ if (indicators.qsIcon == null || !indicators.isDefault) { - return; - } - mWifiInfo.mConnected = indicators.qsIcon.visible; -@@ -275,7 +275,7 @@ public class InternetTile extends QSTileImpl { - if (DEBUG) { - Log.d(TAG, "setMobileDataIndicators: " + indicators); - } -- if (indicators.qsIcon == null) { -+ if (indicators.qsIcon == null || !indicators.isDefault) { - // Not data sim, don't display. - return; - } -diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java -index 43781f3941ba..cf89cabf6ab9 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java -@@ -397,7 +397,7 @@ public class MobileSignalController extends SignalController, D - public String description; - public boolean isTransient; - public String statusLabel; -+ public boolean isDefault; - - public WifiIndicators(boolean enabled, IconState statusIcon, IconState qsIcon, - boolean activityIn, boolean activityOut, String description, -- boolean isTransient, String statusLabel) { -+ boolean isTransient, String statusLabel, boolean isDefault) { - this.enabled = enabled; - this.statusIcon = statusIcon; - this.qsIcon = qsIcon; -@@ -71,6 +72,7 @@ public interface NetworkController extends CallbackController, D - this.description = description; - this.isTransient = isTransient; - this.statusLabel = statusLabel; -+ this.isDefault = isDefault; - } - - @Override -@@ -84,6 +86,7 @@ public interface NetworkController extends CallbackController, D - .append(",description=").append(description) - .append(",isTransient=").append(isTransient) - .append(",statusLabel=").append(statusLabel) -+ .append(",isDefault=").append(isDefault) - .append(']').toString(); - } - } -@@ -105,12 +108,13 @@ public interface NetworkController extends CallbackController, D - public int subId; - public boolean roaming; - public boolean showTriangle; -+ public boolean isDefault; - - public MobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, - int qsType, boolean activityIn, boolean activityOut, - CharSequence typeContentDescription, CharSequence typeContentDescriptionHtml, - CharSequence description, boolean isWide, int subId, boolean roaming, -- boolean showTriangle) { -+ boolean showTriangle, boolean isDefault) { - this.statusIcon = statusIcon; - this.qsIcon = qsIcon; - this.statusType = statusType; -@@ -124,6 +128,7 @@ public interface NetworkController extends CallbackController, D - this.subId = subId; - this.roaming = roaming; - this.showTriangle = showTriangle; -+ this.isDefault = isDefault; - } - - @Override -@@ -142,6 +147,7 @@ public interface NetworkController extends CallbackController, D - .append(",subId=").append(subId) - .append(",roaming=").append(roaming) - .append(",showTriangle=").append(showTriangle) -+ .append(",isDefault=").append(isDefault) - .append(']').toString(); - } - } -diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java -index f8e36476c4a6..1513544eb22b 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java -@@ -112,37 +112,21 @@ public class WifiSignalController extends - if (mCurrentState.inetCondition == 0) { - contentDescription += ("," + mContext.getString(R.string.data_connection_no_internet)); - } -- if (mProviderModelSetting) { -- IconState statusIcon = new IconState( -- wifiVisible, getCurrentIconId(), contentDescription); -- IconState qsIcon = null; -- if (mCurrentState.isDefault || (!mNetworkController.isRadioOn() -- && !mNetworkController.isEthernetDefault())) { -- qsIcon = new IconState(mCurrentState.connected, -- mWifiTracker.isCaptivePortal ? R.drawable.ic_qs_wifi_disconnected -- : getQsCurrentIconId(), contentDescription); -- } -- WifiIndicators wifiIndicators = new WifiIndicators( -- mCurrentState.enabled, statusIcon, qsIcon, -- ssidPresent && mCurrentState.activityIn, -- ssidPresent && mCurrentState.activityOut, -- wifiDesc, mCurrentState.isTransient, mCurrentState.statusLabel -- ); -- callback.setWifiIndicators(wifiIndicators); -- } else { -- IconState statusIcon = new IconState( -- wifiVisible, getCurrentIconId(), contentDescription); -- IconState qsIcon = new IconState(mCurrentState.connected, -- mWifiTracker.isCaptivePortal ? R.drawable.ic_qs_wifi_disconnected -- : getQsCurrentIconId(), contentDescription); -- WifiIndicators wifiIndicators = new WifiIndicators( -- mCurrentState.enabled, statusIcon, qsIcon, -- ssidPresent && mCurrentState.activityIn, -- ssidPresent && mCurrentState.activityOut, -- wifiDesc, mCurrentState.isTransient, mCurrentState.statusLabel -- ); -- callback.setWifiIndicators(wifiIndicators); -- } -+ IconState statusIcon = new IconState( -+ wifiVisible, getCurrentIconId(), contentDescription); -+ IconState qsIcon = new IconState(mCurrentState.connected, -+ mWifiTracker.isCaptivePortal ? R.drawable.ic_qs_wifi_disconnected -+ : getQsCurrentIconId(), contentDescription); -+ boolean isDefault = mCurrentState.isDefault || -+ (!mNetworkController.isRadioOn() && !mNetworkController.isEthernetDefault()); -+ WifiIndicators wifiIndicators = new WifiIndicators( -+ mCurrentState.enabled, statusIcon, qsIcon, -+ ssidPresent && mCurrentState.activityIn, -+ ssidPresent && mCurrentState.activityOut, -+ wifiDesc, mCurrentState.isTransient, mCurrentState.statusLabel, -+ isDefault -+ ); -+ callback.setWifiIndicators(wifiIndicators); - } - - private void notifyListenersForCarrierWifi(SignalCallback callback) { -@@ -173,7 +157,8 @@ public class WifiSignalController extends - statusIcon, qsIcon, typeIcon, qsTypeIcon, - mCurrentState.activityIn, mCurrentState.activityOut, dataContentDescription, - dataContentDescriptionHtml, description, icons.isWide, -- mCurrentState.subId, /* roaming= */ false, /* showTriangle= */ true -+ mCurrentState.subId, /* roaming= */ false, /* showTriangle= */ true, -+ /* isDefault= */ qsIcon != null - ); - callback.setMobileDataIndicators(mobileDataIndicators); - } --- -2.25.1 - diff --git a/patches_platform/lineage-sdk/0001-sdk-Invert-per-app-stretch-to-fullscreen.patch b/patches_platform/lineage-sdk/0001-sdk-Invert-per-app-stretch-to-fullscreen.patch new file mode 100644 index 0000000..d9229cc --- /dev/null +++ b/patches_platform/lineage-sdk/0001-sdk-Invert-per-app-stretch-to-fullscreen.patch @@ -0,0 +1,26 @@ +From 95ef97f5aa82c15e47f9313eca4899d89dba5dd0 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Wed, 4 Jul 2018 17:59:14 +0800 +Subject: [PATCH] sdk: Invert per-app stretch-to-fullscreen implementation + +Change-Id: Idf7dab4e1e0c79953fa672f33ec65fecffb37c83 +--- + sdk/src/java/org/lineageos/internal/applications/LongScreen.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sdk/src/java/org/lineageos/internal/applications/LongScreen.java b/sdk/src/java/org/lineageos/internal/applications/LongScreen.java +index 7fe0d68..26ea349 100644 +--- a/sdk/src/java/org/lineageos/internal/applications/LongScreen.java ++++ b/sdk/src/java/org/lineageos/internal/applications/LongScreen.java +@@ -57,7 +57,7 @@ public class LongScreen { + } + + public boolean shouldForceLongScreen(String packageName) { +- return isSupported() && mApps.contains(packageName); ++ return isSupported() && !(mApps.contains(packageName)); + } + + public Set getApps() { +-- +2.7.4 + diff --git a/patches_platform/packages_apps_LineageParts/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch b/patches_platform/packages_apps_LineageParts/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch new file mode 100644 index 0000000..104146f --- /dev/null +++ b/patches_platform/packages_apps_LineageParts/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch @@ -0,0 +1,105 @@ +From 9fd08fb7ecb602afd3a5f1f19ccc1b20d1cbbe9c Mon Sep 17 00:00:00 2001 +From: AndyCGYan +Date: Sun, 13 Jan 2019 21:44:48 +0800 +Subject: [PATCH] LineageParts: Invert per-app stretch-to-fullscreen + +Change-Id: Icb02c8dfd84882f736e37d6cd92c35e5eb288faa +--- + res/layout/long_screen_layout.xml | 2 +- + res/values-zh-rCN/strings.xml | 6 +++--- + res/values/strings.xml | 6 +++--- + res/xml/long_screen_prefs.xml | 2 +- + res/xml/parts_catalog.xml | 4 ++-- + .../lineageparts/applications/LongScreenSettings.java | 2 +- + 6 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/res/layout/long_screen_layout.xml b/res/layout/long_screen_layout.xml +index 40d0938..1119cef 100644 +--- a/res/layout/long_screen_layout.xml ++++ b/res/layout/long_screen_layout.xml +@@ -36,7 +36,7 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" +- android:text="@string/long_screen_settings_no_apps" ++ android:text="@string/inverse_long_screen_settings_no_apps" + android:textSize="18dp" + android:visibility="gone" /> + +diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml +index 37d129d..97600b8 100644 +--- a/res/values-zh-rCN/strings.xml ++++ b/res/values-zh-rCN/strings.xml +@@ -446,9 +446,9 @@ + 电量 %s 时自动启用省电 + 不要自动启用省电 + 永不 +- 全屏应用 +- 强制旧式应用程序使用全屏长宽比 +- 无应用 ++ 禁用拉伸全屏 ++ 对选定的应用禁用拉伸全屏 ++ 无应用 + 充电提示音 + 启用充电提示音 + 连接或断开电源时发出声音 +diff --git a/res/values/strings.xml b/res/values/strings.xml +index 8421fce..b9f140a 100644 +--- a/res/values/strings.xml ++++ b/res/values/strings.xml +@@ -575,9 +575,9 @@ + Never + + +- Full screen apps +- Force legacy apps to use full screen aspect ratio +- No apps ++ Disable stretch-to-fullscreen ++ Prevent selected apps from utilizing stretch-to-fullscreen ++ No apps + + + Charging sounds +diff --git a/res/xml/long_screen_prefs.xml b/res/xml/long_screen_prefs.xml +index ec947fa..20da90a 100644 +--- a/res/xml/long_screen_prefs.xml ++++ b/res/xml/long_screen_prefs.xml +@@ -18,6 +18,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:lineage="http://schemas.android.com/apk/res/org.lineageos.lineageparts" + android:key="long_screen_settings" +- android:title="@string/long_screen_settings_title"> ++ android:title="@string/inverse_long_screen_settings_title"> + + +diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml +index 2d8dca7..1e6ace4 100644 +--- a/res/xml/parts_catalog.xml ++++ b/res/xml/parts_catalog.xml +@@ -87,8 +87,8 @@ + lineage:xmlRes="@xml/perf_profile_settings" /> + + + +diff --git a/src/org/lineageos/lineageparts/applications/LongScreenSettings.java b/src/org/lineageos/lineageparts/applications/LongScreenSettings.java +index ac04058..50ff8f6 100644 +--- a/src/org/lineageos/lineageparts/applications/LongScreenSettings.java ++++ b/src/org/lineageos/lineageparts/applications/LongScreenSettings.java +@@ -246,7 +246,7 @@ public class LongScreenSettings extends SettingsPreferenceFragment + mApplicationsState.ensureIcon(entry); + holder.icon.setImageDrawable(entry.icon); + holder.state.setTag(entry); +- holder.state.setChecked(mLongScreen.shouldForceLongScreen(entry.info.packageName)); ++ holder.state.setChecked(!(mLongScreen.shouldForceLongScreen(entry.info.packageName))); + return holder.rootView; + } + +-- +2.25.1 + diff --git a/patches_platform/packages_apps_LineageParts/9999-TEMP-LineageParts-Fix-DisplayColor-dialog.patch b/patches_platform/packages_apps_LineageParts/9999-TEMP-LineageParts-Fix-DisplayColor-dialog.patch new file mode 100644 index 0000000..93813bd --- /dev/null +++ b/patches_platform/packages_apps_LineageParts/9999-TEMP-LineageParts-Fix-DisplayColor-dialog.patch @@ -0,0 +1,36 @@ +From 5786216ada9a7351acf816b126df7f428f80128b Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +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 { + 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 + diff --git a/patches_platform/packages_apps_Settings/9999-TEMP-Settings-Hack-in-LiveDisplay-entrypoint.patch b/patches_platform/packages_apps_Settings/9999-TEMP-Settings-Hack-in-LiveDisplay-entrypoint.patch deleted file mode 100644 index d9a8430..0000000 --- a/patches_platform/packages_apps_Settings/9999-TEMP-Settings-Hack-in-LiveDisplay-entrypoint.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6e0b68e9e9da6bcb33eac9e91402a9479419bb86 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Tue, 26 Oct 2021 08:03:39 +0000 -Subject: [PATCH] Settings: Hack in LiveDisplay entrypoint - -Change-Id: Icec153e3d9203bba8bb5b000ecf537397058b349 ---- - res/xml/display_settings.xml | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml -index 7bd370816e..9cf7afe0a5 100644 ---- a/res/xml/display_settings.xml -+++ b/res/xml/display_settings.xml -@@ -86,6 +86,10 @@ - - -+ -+ - Date: Wed, 27 Oct 2021 14:38:37 +0000 Subject: [PATCH 01/16] Add LineageMonetAccentOverlay @@ -17,7 +17,7 @@ Change-Id: Ib93b2bc68a08dfe12a7c3f503dcc62cce098b459 create mode 100644 packages/overlays/LineageMonetAccentOverlay/res/values/config.xml diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk -index 928892c60e47..d90aae92e1c5 100644 +index 3a114bc8ec79..15c55d3d588e 100644 --- a/packages/overlays/Android.mk +++ b/packages/overlays/Android.mk @@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \ diff --git a/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch b/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch index 6248083..f37d215 100644 --- a/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch +++ b/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch @@ -1,11 +1,11 @@ -From 131d58227278ec7d36fe16223335368d4674ce46 Mon Sep 17 00:00:00 2001 +From 9b99205d455b3628d4ab017c77649e116fff182a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 20 Jun 2021 03:39:32 +0000 Subject: [PATCH 02/16] Add MiuiNavbarOverlay Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9 --- - packages/overlays/Android.mk | 3 +- + packages/overlays/Android.mk | 1 + .../overlays/MiuiNavbarOverlay/Android.bp | 28 ++++++++++++++++++ .../MiuiNavbarOverlay/AndroidManifest.xml | 22 ++++++++++++++ .../res/drawable-440dpi-v4/ic_sysbar_back.png | Bin 0 -> 2756 bytes @@ -16,7 +16,7 @@ Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9 .../ic_sysbar_home_darkmode.png | Bin 0 -> 980 bytes .../drawable-440dpi-v4/ic_sysbar_recent.png | Bin 0 -> 278 bytes .../ic_sysbar_recent_darkmode.png | Bin 0 -> 205 bytes - 11 files changed, 52 insertions(+), 1 deletion(-) + 11 files changed, 51 insertions(+) create mode 100644 packages/overlays/MiuiNavbarOverlay/Android.bp create mode 100644 packages/overlays/MiuiNavbarOverlay/AndroidManifest.xml create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_back.png @@ -29,10 +29,10 @@ Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9 create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk -index d90aae92e1c5..2e53fed86f15 100644 +index 15c55d3d588e..ff20a7a30092 100644 --- a/packages/overlays/Android.mk +++ b/packages/overlays/Android.mk -@@ -27,12 +27,13 @@ LOCAL_REQUIRED_MODULES := \ +@@ -27,6 +27,7 @@ LOCAL_REQUIRED_MODULES := \ DisplayCutoutEmulationWaterfallOverlay \ FontNotoSerifSourceOverlay \ LineageMonetAccentOverlay \ @@ -40,13 +40,6 @@ index d90aae92e1c5..2e53fed86f15 100644 NavigationBarMode3ButtonOverlay \ NavigationBarModeGesturalOverlay \ NavigationBarModeGesturalOverlayNarrowBack \ - NavigationBarModeGesturalOverlayWideBack \ - NavigationBarModeGesturalOverlayExtraWideBack \ -- OneHandedModeGesturalOverlay \ -+ OneHandedModeGesturalOverlay \ - preinstalled-packages-platform-overlays.xml - - include $(BUILD_PHONY_PACKAGE) diff --git a/packages/overlays/MiuiNavbarOverlay/Android.bp b/packages/overlays/MiuiNavbarOverlay/Android.bp new file mode 100644 index 000000000000..fc724fb7a686 diff --git a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch index 156b762..7c0da88 100644 --- a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch +++ b/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch @@ -1,4 +1,4 @@ -From 98145d7967512d9e294c9eaf5b4782efd34a1f8d Mon Sep 17 00:00:00 2001 +From a18c07c4fa6a3a3e776b40b13c1e666958fa0549 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 27 Sep 2021 16:30:00 +0000 Subject: [PATCH 03/16] Disable cursor drag by default for editable TextViews diff --git a/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch b/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch index 35fb385..8c2d400 100644 --- a/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch +++ b/patches_platform_personal/frameworks_base/0004-Disable-FP-lockouts.patch @@ -1,4 +1,4 @@ -From 54dcd5497db5593a77aa8c6eacf6b6ed693338cb Mon Sep 17 00:00:00 2001 +From 6b4d66980ecb2a61e959bf256ae3f72ec448945e Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Fri, 22 Mar 2019 00:41:20 +0800 Subject: [PATCH 04/16] Disable FP lockouts diff --git a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch index 142a73e..bd79099 100644 --- a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch +++ b/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch @@ -1,4 +1,4 @@ -From ae4b40705428d23abf321050a64e7793c591ae2b Mon Sep 17 00:00:00 2001 +From 80f4784fd42852d15b2bf815e8f068bc5c4977dd Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 2 Sep 2021 16:15:19 +0000 Subject: [PATCH 05/16] Keyguard: Adjust clock style diff --git a/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch b/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch index 7ada646..5bb6bf2 100644 --- a/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch +++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Hide-padlock-unless-UDFPS-is-in-use.patch @@ -1,4 +1,4 @@ -From 2f8ba4aa72d1c8941f1f6060a0c3a11b179d9447 Mon Sep 17 00:00:00 2001 +From cd9ff5604ed0420eb6e4317370a22293a40f2800 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 2 Nov 2019 06:41:03 +0000 Subject: [PATCH 06/16] Keyguard: Hide padlock unless UDFPS is in use diff --git a/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch b/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch index 4e63514..13593b7 100644 --- a/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch +++ b/patches_platform_personal/frameworks_base/0007-Keyguard-Never-switch-to-large-clock.patch @@ -1,4 +1,4 @@ -From 9e81c9791a5c6fae799bf8d916ed70b62ea23f13 Mon Sep 17 00:00:00 2001 +From 87bc53364912c939e19465304593cf7f03b96b54 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 1 Sep 2021 14:41:53 +0000 Subject: [PATCH 07/16] Keyguard: Never switch to large clock diff --git a/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch b/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch index 531aceb..a483cb6 100644 --- a/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch +++ b/patches_platform_personal/frameworks_base/0008-Keyguard-Refine-indication-text.patch @@ -1,4 +1,4 @@ -From adc13dccc4a4a1f0c59f6d53630d8cd48210b7de Mon Sep 17 00:00:00 2001 +From ce11b93da782f5bd95c0f5c7ce02aa6ace01e6eb Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 2 Nov 2019 08:31:36 +0000 Subject: [PATCH 08/16] Keyguard: Refine indication text @@ -39,7 +39,7 @@ index 8dbd59d42ab7..68cba51e07fa 100644 android:paddingEnd="@dimen/keyguard_indication_text_padding" android:textAppearance="@style/TextAppearance.Keyguard.BottomArea" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml -index c231afc41953..1485f3a936ca 100644 +index 5d4e4a6ad3c4..cd11fb7d81ac 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -920,7 +920,7 @@ diff --git a/patches_platform_personal/frameworks_base/0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch b/patches_platform_personal/frameworks_base/0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch index e5c06bd..1d91d57 100644 --- a/patches_platform_personal/frameworks_base/0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch +++ b/patches_platform_personal/frameworks_base/0009-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch @@ -1,4 +1,4 @@ -From c7a8da0bbddfb96af36f8c62caef774a027ed4a0 Mon Sep 17 00:00:00 2001 +From 3ead32747cd79901a272ed399e88ce957370f0e0 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 20 Mar 2021 10:35:14 +0000 Subject: [PATCH 09/16] Keyguard/UI: Fix status bar / quick settings margins @@ -136,7 +136,7 @@ index 0a34dfd71c7e..3d590d752a7b 100644 400dp diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml -index 1485f3a936ca..b3941ff7f82b 100644 +index cd11fb7d81ac..786b21f7595a 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -449,7 +449,7 @@ @@ -167,10 +167,10 @@ index 1485f3a936ca..b3941ff7f82b 100644 diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java -index a5150000f47c..8ef433c7af17 100644 +index 3478ec463573..386b4e007a90 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java -@@ -88,6 +88,10 @@ public class QuickStatusBarHeader extends FrameLayout { +@@ -91,6 +91,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu private QSExpansionPathInterpolator mQSExpansionPathInterpolator; private int mRoundedCornerPadding = 0; @@ -181,7 +181,7 @@ index a5150000f47c..8ef433c7af17 100644 private int mWaterfallTopInset; private int mCutOutPaddingLeft; private int mCutOutPaddingRight; -@@ -99,6 +103,8 @@ public class QuickStatusBarHeader extends FrameLayout { +@@ -102,6 +106,8 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu private List mRssiIgnoredSlots; private boolean mIsSingleCarrier; @@ -190,7 +190,7 @@ index a5150000f47c..8ef433c7af17 100644 private boolean mHasCenterCutout; private boolean mConfigShowBatteryEstimate; -@@ -240,6 +246,11 @@ public class QuickStatusBarHeader extends FrameLayout { +@@ -244,6 +250,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu mRoundedCornerPadding = resources.getDimensionPixelSize( R.dimen.rounded_corner_content_padding); @@ -202,7 +202,7 @@ index a5150000f47c..8ef433c7af17 100644 int qsOffsetHeight = resources.getDimensionPixelSize( com.android.internal.R.dimen.quick_qs_offset_height); -@@ -320,6 +331,9 @@ public class QuickStatusBarHeader extends FrameLayout { +@@ -324,6 +335,9 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu .addFloat(mDateView, "alpha", 0, 0, 1) .addFloat(mClockDateView, "alpha", 1, 0, 0) .addFloat(mQSCarriers, "alpha", 0, 1) @@ -212,7 +212,7 @@ index a5150000f47c..8ef433c7af17 100644 .setListener(new TouchAnimator.ListenerAdapter() { @Override public void onAnimationAtEnd() { -@@ -426,8 +440,6 @@ public class QuickStatusBarHeader extends FrameLayout { +@@ -430,8 +444,6 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu Pair padding = StatusBarWindowView.paddingNeededForCutoutAndRoundedCorner( cutout, cornerCutoutPadding, -1); @@ -221,7 +221,7 @@ index a5150000f47c..8ef433c7af17 100644 LinearLayout.LayoutParams datePrivacySeparatorLayoutParams = (LinearLayout.LayoutParams) mDatePrivacySeparator.getLayoutParams(); LinearLayout.LayoutParams mClockIconsSeparatorLayoutParams = -@@ -442,6 +454,12 @@ public class QuickStatusBarHeader extends FrameLayout { +@@ -446,6 +458,12 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu mClockIconsSeparatorLayoutParams.width = 0; setSeparatorVisibility(false); mShowClockIconsSeparator = false; @@ -234,7 +234,7 @@ index a5150000f47c..8ef433c7af17 100644 mHasCenterCutout = false; } else { datePrivacySeparatorLayoutParams.width = topCutout.width(); -@@ -449,6 +467,8 @@ public class QuickStatusBarHeader extends FrameLayout { +@@ -453,6 +471,8 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu mClockIconsSeparatorLayoutParams.width = topCutout.width(); mShowClockIconsSeparator = true; setSeparatorVisibility(mKeyguardExpansionFraction == 0f); @@ -243,7 +243,7 @@ index a5150000f47c..8ef433c7af17 100644 mHasCenterCutout = true; } } -@@ -493,34 +513,37 @@ public class QuickStatusBarHeader extends FrameLayout { +@@ -497,34 +517,37 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu private void updateHeadersPadding() { setContentMargins(mDatePrivacyView, 0, 0); setContentMargins(mClockIconsView, 0, 0); @@ -299,10 +299,10 @@ index a5150000f47c..8ef433c7af17 100644 } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -index 7b4dc47a7b48..f3cd8daf8d03 100644 +index efc02548763a..ce5719c674dd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -@@ -165,14 +165,7 @@ public class KeyguardStatusBarView extends RelativeLayout implements +@@ -164,14 +164,7 @@ public class KeyguardStatusBarView extends RelativeLayout implements mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize( com.android.internal.R.dimen.text_size_small_material)); diff --git a/patches_platform_personal/frameworks_base/0010-Revert-monet-Add-support-for-monet-cam16.patch b/patches_platform_personal/frameworks_base/0010-Revert-monet-Add-support-for-monet-cam16.patch index 9a5b3ad..eeb59de 100644 --- a/patches_platform_personal/frameworks_base/0010-Revert-monet-Add-support-for-monet-cam16.patch +++ b/patches_platform_personal/frameworks_base/0010-Revert-monet-Add-support-for-monet-cam16.patch @@ -1,21 +1,76 @@ -From 083ce1f8d7cd3baa0aa97940b2d53d0b65ced059 Mon Sep 17 00:00:00 2001 +From 9fa5b43574c485faebf2806584f82311fa220b16 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 19 Oct 2021 12:11:24 +0000 Subject: [PATCH 10/16] Revert "monet: Add support for monet (cam16)" This reverts commit f4460c9cb0494ddcc1829b05298d140fa1afc526. + +Change-Id: I94ca83b2c147a32afeb4fbddbc5d6dbcfd804199 --- + packages/SystemUI/Android.bp | 2 - + packages/SystemUI/monet/Android.bp | 12 -- + packages/SystemUI/monet/AndroidManifest.xml | 4 - .../com/android/systemui/monet/ColorScheme.kt | 168 ------------------ .../com/android/systemui/monet/Shades.java | 19 -- - .../theme/ThemeOverlayController.java | 55 ++---- - 3 files changed, 10 insertions(+), 232 deletions(-) - delete mode 100644 packages/SystemUI/src/com/android/systemui/monet/ColorScheme.kt - delete mode 100644 packages/SystemUI/src/com/android/systemui/monet/Shades.java + .../theme/ThemeOverlayController.java | 56 ++---- + 6 files changed, 10 insertions(+), 251 deletions(-) + delete mode 100644 packages/SystemUI/monet/Android.bp + delete mode 100644 packages/SystemUI/monet/AndroidManifest.xml + delete mode 100644 packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt + delete mode 100644 packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java -diff --git a/packages/SystemUI/src/com/android/systemui/monet/ColorScheme.kt b/packages/SystemUI/src/com/android/systemui/monet/ColorScheme.kt +diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp +index e677b10295f6..e86486dbc6bc 100644 +--- a/packages/SystemUI/Android.bp ++++ b/packages/SystemUI/Android.bp +@@ -97,7 +97,6 @@ android_library { + "lottie", + "org.lineageos.platform.internal", + "vendor.lineage.powershare-V1.0-java", +- "monet", + ], + manifest: "AndroidManifest.xml", + additional_manifests: ["LineageManifest.xml"], +@@ -188,7 +187,6 @@ android_library { + "WindowManager-Shell", + "org.lineageos.platform.internal", + "vendor.lineage.powershare-V1.0-java", +- "monet", + ], + libs: [ + "android.test.runner", +diff --git a/packages/SystemUI/monet/Android.bp b/packages/SystemUI/monet/Android.bp +deleted file mode 100644 +index 42563765b077..000000000000 +--- a/packages/SystemUI/monet/Android.bp ++++ /dev/null +@@ -1,12 +0,0 @@ +-java_library { +- name: "monet", +- platform_apis: true, +- static_libs: [ +- "androidx.annotation_annotation", +- "androidx.core_core", +- ], +- srcs: [ +- "src/**/*.java", +- "src/**/*.kt", +- ], +-} +diff --git a/packages/SystemUI/monet/AndroidManifest.xml b/packages/SystemUI/monet/AndroidManifest.xml +deleted file mode 100644 +index 37f0050ee949..000000000000 +--- a/packages/SystemUI/monet/AndroidManifest.xml ++++ /dev/null +@@ -1,4 +0,0 @@ +- +- +- +diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt b/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt deleted file mode 100644 index 56a9c805ca81..000000000000 ---- a/packages/SystemUI/src/com/android/systemui/monet/ColorScheme.kt +--- a/packages/SystemUI/monet/src/com/android/systemui/monet/ColorScheme.kt +++ /dev/null @@ -1,168 +0,0 @@ -package com.android.systemui.monet @@ -186,10 +241,10 @@ index 56a9c805ca81..000000000000 - } - } -} -diff --git a/packages/SystemUI/src/com/android/systemui/monet/Shades.java b/packages/SystemUI/src/com/android/systemui/monet/Shades.java +diff --git a/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java b/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java deleted file mode 100644 index 5ab00a1afcb4..000000000000 ---- a/packages/SystemUI/src/com/android/systemui/monet/Shades.java +--- a/packages/SystemUI/monet/src/com/android/systemui/monet/Shades.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.android.systemui.monet; @@ -212,7 +267,7 @@ index 5ab00a1afcb4..000000000000 - } -} diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java -index 7cd3ae1f8062..81999b534046 100644 +index 1e35c9e51150..81999b534046 100644 --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java @@ -37,7 +37,6 @@ import android.content.IntentFilter; @@ -235,14 +290,14 @@ index 7cd3ae1f8062..81999b534046 100644 import com.android.systemui.Dumpable; import com.android.systemui.SystemUI; import com.android.systemui.broadcast.BroadcastDispatcher; -@@ -62,7 +59,6 @@ import com.android.systemui.dagger.qualifiers.Main; +@@ -61,7 +58,6 @@ import com.android.systemui.dagger.qualifiers.Background; + import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dump.DumpManager; import com.android.systemui.keyguard.WakefulnessLifecycle; - import com.android.systemui.settings.UserTracker; -import com.android.systemui.monet.ColorScheme; + import com.android.systemui.settings.UserTracker; import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.policy.DeviceProvisionedController; - import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener; @@ -75,7 +71,6 @@ import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.Collection; @@ -251,7 +306,7 @@ index 7cd3ae1f8062..81999b534046 100644 import java.util.Map; import java.util.Set; import java.util.concurrent.Executor; -@@ -408,55 +403,25 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { +@@ -408,56 +403,25 @@ public class ThemeOverlayController extends SystemUI implements Dumpable { * Return the main theme color from a given {@link WallpaperColors} instance. */ protected int getNeutralColor(@NonNull WallpaperColors wallpaperColors) { @@ -293,19 +348,20 @@ index 7cd3ae1f8062..81999b534046 100644 - } - - int size = colorScheme.getAccent1().size(); -- FabricatedOverlay.Builder builder = new FabricatedOverlay.Builder(mContext.getPackageName(), name, "android"); +- FabricatedOverlay.Builder builder = +- new FabricatedOverlay.Builder(mContext.getPackageName(), name, "android"); - - for (int i = 0; i < colors.size(); i++) { - int lightness = i % size; - int shade = i / size + 1; - -- String targetResource; +- String targetResource = "android:color/system_"; - if (lightness == 0) { -- targetResource = "android:color/system_" + name + shade + "_10"; +- targetResource += name + shade + "_10"; - } else if (lightness == 1) { -- targetResource = "android:color/system_" + name + shade + "_50"; +- targetResource += name + shade + "_50"; - } else { -- targetResource = "android:color/system_" + name + shade + "_" + (lightness - 1) + "00"; +- targetResource += name + shade + "_" + (lightness - 1) + "00"; - } - - builder.setResourceValue(targetResource, TypedValue.TYPE_INT_COLOR_ARGB8, diff --git a/patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch b/patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch index d1dfdfb..2b086ef 100644 --- a/patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch +++ b/patches_platform_personal/frameworks_base/0011-Revert-Update-RAT-icons-to-match-Silk-design.patch @@ -1,4 +1,4 @@ -From 9acde8c9886310dbbfe63e7cd6f30d4656d66b72 Mon Sep 17 00:00:00 2001 +From a1a23648cb1a916a9a6da88d68a41a01f6eceb06 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 5 Sep 2021 01:20:12 +0000 Subject: [PATCH 11/16] Revert "Update RAT icons to match Silk design" diff --git a/patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch b/patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch index c3c8d3d..cb712bc 100644 --- a/patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch +++ b/patches_platform_personal/frameworks_base/0012-UI-Always-render-windows-into-cutouts.patch @@ -1,4 +1,4 @@ -From 2377ef0cd6f3fb4abd5038b84c5bf785035ce738 Mon Sep 17 00:00:00 2001 +From 1d8c1d751b1bb0b5d36a00eceec1308d6e83523d Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 7 Oct 2020 14:00:35 +0000 Subject: [PATCH 12/16] UI: Always render windows into cutouts @@ -55,10 +55,10 @@ index 32e43ca4e56c..18c28ae674f9 100644 } diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java -index 10b36fe67daf..2a1817269446 100644 +index 41247363146d..554dea8efb33 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java -@@ -1616,7 +1616,7 @@ public class DisplayPolicy { +@@ -1655,7 +1655,7 @@ public class DisplayPolicy { pf.set((fl & FLAG_LAYOUT_IN_SCREEN) == 0 ? attached.getFrame() : df); } diff --git a/patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch b/patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch index aca5463..7e0e8cb 100644 --- a/patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch +++ b/patches_platform_personal/frameworks_base/0013-UI-Kill-rounded-corners-in-notification-scrim.patch @@ -1,4 +1,4 @@ -From cb0906eadc39915aae89e82b32905fc1e3925359 Mon Sep 17 00:00:00 2001 +From e79fe0c08cb680f1c2855caa877acacdf0bdb3dd Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 1 Sep 2021 14:10:50 +0000 Subject: [PATCH 13/16] UI: Kill rounded corners in notification scrim @@ -11,7 +11,7 @@ Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml -index b3941ff7f82b..140043673612 100644 +index 786b21f7595a..7217156d8972 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -757,7 +757,7 @@ diff --git a/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch b/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch index 1394098..604e0ef 100644 --- a/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch +++ b/patches_platform_personal/frameworks_base/0014-UI-Reconfigure-power-menu-items.patch @@ -1,4 +1,4 @@ -From f81da8f238f0ddf872ce900bade1783482bac0cb Mon Sep 17 00:00:00 2001 +From f0d1748dc95cb747329c816153d68954255be322 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 26 Oct 2020 14:06:56 +0000 Subject: [PATCH 14/16] UI: Reconfigure power menu items @@ -11,10 +11,10 @@ Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc 1 file changed, 5 deletions(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 1319c26bb1be..e294223c9066 100644 +index 3a62b51d3cbc..5e9c9988e946 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -2961,13 +2961,8 @@ +@@ -2963,13 +2963,8 @@ "logout" = Logout the current user --> diff --git a/patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch b/patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch index 4be42da..3556d92 100644 --- a/patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch +++ b/patches_platform_personal/frameworks_base/0015-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch @@ -1,4 +1,4 @@ -From 48705c6c69f2f3f6c8e8005b3c9b50883fe178d4 Mon Sep 17 00:00:00 2001 +From ec1007b99324812eebc112d12f6f56666cd54cae Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 29 Jun 2021 22:57:01 +0000 Subject: [PATCH 15/16] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT diff --git a/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch b/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch index 161fed1..dea5ed0 100644 --- a/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch +++ b/patches_platform_personal/frameworks_base/0016-UI-Remove-privacy-dot-padding.patch @@ -1,4 +1,4 @@ -From 934dfff90102f46f097c5912ab9994d6796d9c63 Mon Sep 17 00:00:00 2001 +From ac98eee7ee113a71ae05e00c23b14e94c3539f73 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 19 Oct 2021 12:09:34 +0000 Subject: [PATCH 16/16] UI: Remove privacy dot padding @@ -9,7 +9,7 @@ Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml -index 140043673612..51d4ffbc2d49 100644 +index 7217156d8972..4354442fb51d 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -1265,7 +1265,7 @@ diff --git a/patches_platform_personal/packages_apps_Trebuchet/0001-Revert-Implement-LocalColorExtractor-using-monet-the.patch b/patches_platform_personal/packages_apps_Trebuchet/0001-Revert-Implement-LocalColorExtractor-using-monet-the.patch new file mode 100644 index 0000000..9f84aac --- /dev/null +++ b/patches_platform_personal/packages_apps_Trebuchet/0001-Revert-Implement-LocalColorExtractor-using-monet-the.patch @@ -0,0 +1,260 @@ +From 54374a8c7cdb6df7657090ff849cce25d051ee52 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Mon, 10 Jan 2022 04:44:58 +0000 +Subject: [PATCH] Revert "Implement LocalColorExtractor using monet theme + engine" + +This reverts commit 43594af5b025d2223f9eab97e9226541b2851419. +--- + Android.bp | 1 - + res/values/config.xml | 2 +- + .../widget/LocalWallpaperColorsExtractor.java | 212 ------------------ + 3 files changed, 1 insertion(+), 214 deletions(-) + delete mode 100644 src/com/android/launcher3/widget/LocalWallpaperColorsExtractor.java + +diff --git a/Android.bp b/Android.bp +index 621eaf0a1e..f700dedf03 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -122,7 +122,6 @@ android_library { + "com.google.android.material_material", + "iconloader_base", + "libGoogleFeed", +- "monet", + ], + manifest: "AndroidManifest-common.xml", + sdk_version: "current", +diff --git a/res/values/config.xml b/res/values/config.xml +index 95f94af904..0ac0f9c588 100644 +--- a/res/values/config.xml ++++ b/res/values/config.xml +@@ -87,7 +87,7 @@ + + + +- com.android.launcher3.widget.LocalWallpaperColorsExtractor ++ + + + +diff --git a/src/com/android/launcher3/widget/LocalWallpaperColorsExtractor.java b/src/com/android/launcher3/widget/LocalWallpaperColorsExtractor.java +deleted file mode 100644 +index 29d464826e..0000000000 +--- a/src/com/android/launcher3/widget/LocalWallpaperColorsExtractor.java ++++ /dev/null +@@ -1,212 +0,0 @@ +-package com.android.launcher3.widget; +- +-import android.app.WallpaperColors; +-import android.app.WallpaperManager; +-import android.content.Context; +-import android.content.res.Configuration; +-import android.content.res.Resources; +-import android.graphics.Rect; +-import android.graphics.RectF; +-import android.util.SparseIntArray; +-import android.view.View; +-import android.widget.RemoteViews; +- +-import com.android.launcher3.DeviceProfile; +-import com.android.launcher3.Launcher; +-import com.android.launcher3.Utilities; +-import com.android.launcher3.widget.LocalColorExtractor; +-import com.android.systemui.monet.ColorScheme; +- +-import java.util.List; +- +-public class LocalWallpaperColorsExtractor extends LocalColorExtractor implements +- WallpaperManager.LocalWallpaperColorConsumer { +- +- private final WallpaperManager wallpaperManager; +- private Listener listener; +- private Context mContext; +- +- // For calculating and returning bounds +- private final float[] tempFloatArray = new float[4]; +- private final Rect tempRect = new Rect(); +- private final RectF tempRectF = new RectF(); +- +- public static final int[] accent = { +- android.R.color.system_accent1_10, +- android.R.color.system_accent1_50, +- android.R.color.system_accent1_100, +- android.R.color.system_accent1_200, +- android.R.color.system_accent1_300, +- android.R.color.system_accent1_400, +- android.R.color.system_accent1_500, +- android.R.color.system_accent1_600, +- android.R.color.system_accent1_700, +- android.R.color.system_accent1_800, +- android.R.color.system_accent1_900, +- android.R.color.system_accent1_1000, +- android.R.color.system_accent2_10, +- android.R.color.system_accent2_50, +- android.R.color.system_accent2_100, +- android.R.color.system_accent2_200, +- android.R.color.system_accent2_300, +- android.R.color.system_accent2_400, +- android.R.color.system_accent2_500, +- android.R.color.system_accent2_600, +- android.R.color.system_accent2_700, +- android.R.color.system_accent2_800, +- android.R.color.system_accent2_900, +- android.R.color.system_accent2_1000, +- android.R.color.system_accent3_10, +- android.R.color.system_accent3_50, +- android.R.color.system_accent3_100, +- android.R.color.system_accent3_200, +- android.R.color.system_accent3_300, +- android.R.color.system_accent3_400, +- android.R.color.system_accent3_500, +- android.R.color.system_accent3_600, +- android.R.color.system_accent3_700, +- android.R.color.system_accent3_800, +- android.R.color.system_accent3_900, +- android.R.color.system_accent3_1000 +- }; +- +- public static final int[] neutral = { +- android.R.color.system_neutral1_10, +- android.R.color.system_neutral1_50, +- android.R.color.system_neutral1_100, +- android.R.color.system_neutral1_200, +- android.R.color.system_neutral1_300, +- android.R.color.system_neutral1_400, +- android.R.color.system_neutral1_500, +- android.R.color.system_neutral1_600, +- android.R.color.system_neutral1_700, +- android.R.color.system_neutral1_800, +- android.R.color.system_neutral1_900, +- android.R.color.system_neutral1_1000, +- android.R.color.system_neutral2_10, +- android.R.color.system_neutral2_50, +- android.R.color.system_neutral2_100, +- android.R.color.system_neutral2_200, +- android.R.color.system_neutral2_300, +- android.R.color.system_neutral2_400, +- android.R.color.system_neutral2_500, +- android.R.color.system_neutral2_600, +- android.R.color.system_neutral2_700, +- android.R.color.system_neutral2_800, +- android.R.color.system_neutral2_900, +- android.R.color.system_neutral2_1000 +- }; +- +- public LocalWallpaperColorsExtractor(Context context) { +- mContext = context; +- wallpaperManager = (WallpaperManager) context.getSystemService(Context.WALLPAPER_SERVICE); +- } +- +- private static void addColorsToArray(List list, int[] resArray, SparseIntArray array) { +- for (int i = 0; i < resArray.length; i++) { +- array.put(resArray[i], -16777216 | list.get(i)); +- } +- } +- +- @Override +- public void setListener(Listener listener) { +- this.listener = listener; +- } +- +- @Override +- public void addLocation(List locations) { +- wallpaperManager.addOnColorsChangedListener(this, locations); +- } +- +- @Override +- public void removeLocations() { +- wallpaperManager.removeOnColorsChangedListener(this); +- } +- +- @Override +- public SparseIntArray generateColorsOverride(WallpaperColors colors) { +- SparseIntArray colorRes = new SparseIntArray(5 * 13); +- boolean nightMode = (mContext.getResources().getConfiguration().uiMode +- & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES; +- +- ColorScheme colorScheme = new ColorScheme(ColorScheme.getSeedColor(colors), nightMode); +- +- addColorsToArray(colorScheme.getAllAccentColors(), accent, colorRes); +- addColorsToArray(colorScheme.getAllNeutralColors(), neutral, colorRes); +- +- return colorRes; +- } +- +- @Override +- public void applyColorsOverride(Context base, WallpaperColors colors) { +- RemoteViews.ColorResources res = +- RemoteViews.ColorResources.create(base, generateColorsOverride(colors)); +- if (res != null) { +- res.apply(base); +- } +- } +- +- @Override +- public void getExtractedRectForView(Launcher launcher, int pageId, View v, +- RectF colorExtractionRectOut) { +- Rect viewRect = tempRect; +- viewRect.set(0, 0, v.getWidth(), v.getHeight()); +- Utilities.getBoundsForViewInDragLayer(launcher.getDragLayer(), v, viewRect, false, +- tempFloatArray, tempRectF); +- Utilities.setRect(tempRectF, viewRect); +- getExtractedRectForViewRect(launcher, pageId, viewRect, colorExtractionRectOut); +- } +- +- @Override +- public void getExtractedRectForViewRect(Launcher launcher, int pageId, Rect rectInDragLayer, +- RectF colorExtractionRectOut) { +- // If the view hasn't been measured and laid out, we cannot do this. +- if (rectInDragLayer.isEmpty()) { +- colorExtractionRectOut.setEmpty(); +- return; +- } +- +- Resources res = launcher.getResources(); +- DeviceProfile dp = launcher.getDeviceProfile().inv.getDeviceProfile(launcher); +- float screenWidth = dp.widthPx; +- float screenHeight = dp.heightPx; +- int numScreens = launcher.getWorkspace().getNumPagesForWallpaperParallax(); +- pageId = Utilities.isRtl(res) ? numScreens - pageId - 1 : pageId; +- float relativeScreenWidth = 1f / numScreens; +- +- int[] dragLayerBounds = new int[2]; +- launcher.getDragLayer().getLocationOnScreen(dragLayerBounds); +- // Translate from drag layer coordinates to screen coordinates. +- int screenLeft = rectInDragLayer.left + dragLayerBounds[0]; +- int screenTop = rectInDragLayer.top + dragLayerBounds[1]; +- int screenRight = rectInDragLayer.right + dragLayerBounds[0]; +- int screenBottom = rectInDragLayer.bottom + dragLayerBounds[1]; +- +- // This is the position of the view relative to the wallpaper, as expected by the +- // local color extraction of the WallpaperManager. +- // The coordinate system is such that, on the horizontal axis, each screen has a +- // distinct range on the [0,1] segment. So if there are 3 screens, they will have the +- // ranges [0, 1/3], [1/3, 2/3] and [2/3, 1]. The position on the subrange should be +- // the position of the view relative to the screen. For the vertical axis, this is +- // simply the location of the view relative to the screen. +- // Translate from drag layer coordinates to screen coordinates +- colorExtractionRectOut.left = (screenLeft / screenWidth + pageId) * relativeScreenWidth; +- colorExtractionRectOut.right = (screenRight / screenWidth + pageId) * relativeScreenWidth; +- colorExtractionRectOut.top = screenTop / screenHeight; +- colorExtractionRectOut.bottom = screenBottom / screenHeight; +- +- if (colorExtractionRectOut.left < 0 +- || colorExtractionRectOut.right > 1 +- || colorExtractionRectOut.top < 0 +- || colorExtractionRectOut.bottom > 1) { +- colorExtractionRectOut.setEmpty(); +- } +- } +- +- @Override +- public void onColorsChanged(RectF area, WallpaperColors colors) { +- if (listener != null) { +- listener.onColorsChanged(area, generateColorsOverride(colors)); +- } +- } +-} +-- +2.25.1 + diff --git a/patches_treble_personal/device_phh_treble/0001-Add-Meizu-18-vibrator-support.patch b/patches_treble_personal/device_phh_treble/0001-Add-Meizu-18-vibrator-support.patch index 7c22573..11f524e 100644 --- a/patches_treble_personal/device_phh_treble/0001-Add-Meizu-18-vibrator-support.patch +++ b/patches_treble_personal/device_phh_treble/0001-Add-Meizu-18-vibrator-support.patch @@ -1,4 +1,4 @@ -From 52882c890900516ce50dcd09d8f5de9d672191df Mon Sep 17 00:00:00 2001 +From d18f52a69d550666acab021aa3d6261c83cf9299 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 22 Jun 2021 13:38:31 +0000 Subject: [PATCH 1/4] Add Meizu 18 vibrator support @@ -27,12 +27,12 @@ Change-Id: Iecf12cd814e8773abfd78a19f98e31125a73761a create mode 100644 hal/meizu-vibrator/service.cpp diff --git a/base.mk b/base.mk -index 0bd6bf0..409bb1d 100644 +index a372603..a537411 100644 --- a/base.mk +++ b/base.mk -@@ -209,4 +209,7 @@ PRODUCT_PACKAGES += \ - PRODUCT_PACKAGES += \ - oplus-alert-slider +@@ -218,4 +218,7 @@ PRODUCT_COPY_FILES += \ + device/phh/treble/proprietary-files/gome/fs16xx_01s_right.preset:system/phh/gome/fs16xx_01s_right.preset \ + device/phh/treble/proprietary-files/umidigi/fs16xx_01s_mono.preset:system/phh/umidigi/fs16xx_01s_mono.preset +PRODUCT_PACKAGES += \ + android.hardware.vibrator@1.3-service.meizu diff --git a/patches_treble_personal/device_phh_treble/0002-Only-use-meizu-vibrator-on-Meizu-18.patch b/patches_treble_personal/device_phh_treble/0002-Only-use-meizu-vibrator-on-Meizu-18.patch index 4e6b702..3965cd8 100644 --- a/patches_treble_personal/device_phh_treble/0002-Only-use-meizu-vibrator-on-Meizu-18.patch +++ b/patches_treble_personal/device_phh_treble/0002-Only-use-meizu-vibrator-on-Meizu-18.patch @@ -1,4 +1,4 @@ -From fd5e5139356c792a17328692a90abc6b2c40677e Mon Sep 17 00:00:00 2001 +From 0cca559de53a92eac0e6810ebed31967d70d4ca0 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 27 Jun 2021 05:21:38 +0000 Subject: [PATCH 2/4] Only use meizu-vibrator on Meizu 18 @@ -76,10 +76,10 @@ index 0000000..b34a10b + + diff --git a/rw-system.sh b/rw-system.sh -index a49e8f5..434be7c 100644 +index ee4df70..3ed1cdd 100644 --- a/rw-system.sh +++ b/rw-system.sh -@@ -325,6 +325,12 @@ if [ "$foundFingerprint" = false ];then +@@ -356,6 +356,12 @@ if [ "$foundFingerprint" = false ];then mount -o bind system/phh/empty /system/etc/permissions/android.hardware.fingerprint.xml fi @@ -92,7 +92,7 @@ index a49e8f5..434be7c 100644 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_le.xml -@@ -396,7 +402,7 @@ if getprop ro.build.overlay.deviceid |grep -q -e CPH1859 -e CPH1861 -e RMX1811 - +@@ -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 @@ -101,7 +101,7 @@ index a49e8f5..434be7c 100644 setprop persist.sys.qcom-brightness 2047 setprop persist.sys.overlay.devinputjack true setprop persist.sys.phh.fingerprint.nocleanup true -@@ -891,7 +897,7 @@ if getprop ro.build.overlay.deviceid |grep -qiE -e '^RMX' -e '^CPH';then +@@ -940,7 +946,7 @@ if (getprop ro.vendor.build.fingerprint;getprop ro.odm.build.fingerprint) |grep setprop persist.sys.phh.fod.bbk true fi diff --git a/patches_treble_personal/device_phh_treble/0003-Revert-Include-sim-toolkit-app.patch b/patches_treble_personal/device_phh_treble/0003-Revert-Include-sim-toolkit-app.patch index fb45511..c5aad18 100644 --- a/patches_treble_personal/device_phh_treble/0003-Revert-Include-sim-toolkit-app.patch +++ b/patches_treble_personal/device_phh_treble/0003-Revert-Include-sim-toolkit-app.patch @@ -1,4 +1,4 @@ -From dd31f491d59f77fe6451de89882d17d432cacdaf Mon Sep 17 00:00:00 2001 +From 0ff36ed6acdc7addbc61fff048b6f2b028f615c0 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 28 Oct 2021 01:51:27 +0000 Subject: [PATCH 3/4] Revert "Include sim toolkit app" @@ -11,10 +11,10 @@ Change-Id: I1eb7f4bb070eea649b4cea6280299e629d1edb3d 1 file changed, 3 deletions(-) diff --git a/base.mk b/base.mk -index 409bb1d..b8b078e 100644 +index a537411..bc5ba37 100644 --- a/base.mk +++ b/base.mk -@@ -156,9 +156,6 @@ PRODUCT_PACKAGES += \ +@@ -157,9 +157,6 @@ PRODUCT_PACKAGES += \ xiaomi-motor \ oneplus-motor diff --git a/patches_treble_personal/device_phh_treble/0004-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch b/patches_treble_personal/device_phh_treble/0004-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch index 38d2bc6..aa1894b 100644 --- a/patches_treble_personal/device_phh_treble/0004-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch +++ b/patches_treble_personal/device_phh_treble/0004-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch @@ -1,4 +1,4 @@ -From 45739cc78ffe6af2124211ef108fef17bdc56baa Mon Sep 17 00:00:00 2001 +From dfb80c5cb89c33b2be845fec1cca084399a7f71f Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 8 Aug 2021 09:31:01 +0000 Subject: [PATCH 4/4] Revert "treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS diff --git a/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch b/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch index 1d8c10c..04c7e7a 100644 --- a/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch +++ b/patches_treble_phh/platform_frameworks_base/0001-Fallback-to-stupid-autobrightness-if-brightness-valu.patch @@ -1,7 +1,7 @@ -From ed69eff0e245bc8a8b7c3334b5c30323a09dbfc3 Mon Sep 17 00:00:00 2001 +From 6a586c8d51eddc005f1215e73327321296c047fd Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 5 Oct 2021 17:59:16 -0400 -Subject: [PATCH 01/24] Fallback to stupid autobrightness if brightness values +Subject: [PATCH 01/28] Fallback to stupid autobrightness if brightness values are broken This is needed because of: diff --git a/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch index 274d3f3..87be30b 100644 --- a/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch +++ b/patches_treble_phh/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch @@ -1,7 +1,7 @@ -From c3bc53d43b9c4789bab8c532c44cc6f423810801 Mon Sep 17 00:00:00 2001 +From 19e1c2ec405a3a378fd80b86716d65692da7a1cd Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 28 Nov 2017 18:28:04 +0100 -Subject: [PATCH 02/24] Relax requirement for visible flag to sdcards +Subject: [PATCH 02/28] Relax requirement for visible flag to sdcards The vast majority of sdcard readers are stable enough to be declared by the API. (I see no counter-example) diff --git a/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch index 3adc04d..642c0c7 100644 --- a/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch +++ b/patches_treble_phh/platform_frameworks_base/0003-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch @@ -1,7 +1,7 @@ -From 9dda80f5f617988755425931377956386d70a703 Mon Sep 17 00:00:00 2001 +From 52c14e64a80eede9b3e82afd54fd4e6cf5862cf1 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Thu, 17 May 2018 20:28:35 +0200 -Subject: [PATCH 03/24] 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 Change-Id: I3afded27441bbee8244d5fda544b3e6d1238dc1b --- diff --git a/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch b/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch index f1a2b0c..9aa8e80 100644 --- a/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch +++ b/patches_treble_phh/platform_frameworks_base/0004-Show-APN-Settings-for-CDMA-carriers.patch @@ -1,7 +1,7 @@ -From 639661b3368671a56a3a2b114d6ffb5c1e6ee95f Mon Sep 17 00:00:00 2001 +From 33fb74d694502c95ee26f331ea308114f8506b90 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 6 Aug 2018 12:49:00 +0200 -Subject: [PATCH 04/24] Show APN Settings for CDMA carriers +Subject: [PATCH 04/28] Show APN Settings for CDMA carriers --- telephony/java/android/telephony/CarrierConfigManager.java | 2 +- diff --git a/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch b/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch index 720a219..0e62bf9 100644 --- a/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch +++ b/patches_treble_phh/platform_frameworks_base/0005-Re-order-services-so-that-it-works-even-without-qtag.patch @@ -1,7 +1,7 @@ -From a80899cb43a7a0876e2484807dea69c7ddb0b3be Mon Sep 17 00:00:00 2001 +From b9d12e89208f1b10efbf6d64b9c1b8613b6b336c Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Thu, 8 Nov 2018 23:04:03 +0100 -Subject: [PATCH 05/24] Re-order services so that it works even without qtaguid +Subject: [PATCH 05/28] Re-order services so that it works even without qtaguid Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df --- @@ -9,10 +9,10 @@ Change-Id: I0c0f527b3ae151d45c68f7ac6c205da3f34e74df 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 -index cfefffcdd2e8..197fed7c8834 100644 +index 9c664b6da4f2..8ebcfb667161 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java -@@ -845,6 +845,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { +@@ -878,6 +878,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "systemReady"); final int oldPriority = Process.getThreadPriority(Process.myTid()); try { @@ -23,7 +23,7 @@ index cfefffcdd2e8..197fed7c8834 100644 // Boost thread's priority during system server init Process.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND); if (!isBandwidthControlEnabled()) { -@@ -852,10 +856,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { +@@ -885,10 +889,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { return; } diff --git a/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch b/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch index 4c86c73..9de8683 100644 --- a/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch +++ b/patches_treble_phh/platform_frameworks_base/0006-Support-samsung-Pie-and-Q-light-hal.patch @@ -1,7 +1,7 @@ -From b16ff9568fb76c327e71d32878c6b182a3d8acd4 Mon Sep 17 00:00:00 2001 +From 073b07985a88b4ab54a9451503d58070de0f0721 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 24 Mar 2019 23:05:14 +0100 -Subject: [PATCH 06/24] Support samsung Pie and Q light hal +Subject: [PATCH 06/28] Support samsung Pie and Q light hal Change-Id: I01f94acd7d0672733e48854d80368f9ac6f861c6 --- @@ -23,10 +23,10 @@ index 81532bcba0ae..8ddc16aae3d7 100644 static_libs: [ diff --git a/services/core/jni/com_android_server_lights_LightsService.cpp b/services/core/jni/com_android_server_lights_LightsService.cpp -index 26f6d7428fcc..268b59a58010 100644 +index 35d8219651d7..b45b2137d0e6 100644 --- a/services/core/jni/com_android_server_lights_LightsService.cpp +++ b/services/core/jni/com_android_server_lights_LightsService.cpp -@@ -22,6 +22,10 @@ +@@ -23,6 +23,10 @@ #include #include @@ -37,7 +37,7 @@ index 26f6d7428fcc..268b59a58010 100644 #include #include #include -@@ -39,8 +43,17 @@ using Type = ::android::hardware::light::V2_0::Type; +@@ -40,8 +44,17 @@ using Type = ::android::hardware::light::V2_0::Type; template using Return = ::android::hardware::Return; @@ -55,8 +55,8 @@ index 26f6d7428fcc..268b59a58010 100644 static bool validate(jint light, jint flash, jint brightness) { bool valid = true; -@@ -141,6 +154,44 @@ static void setLight_native( - return; +@@ -152,6 +165,44 @@ static void setLight_native( + colorARGB = (colorAlpha << 24) + (colorARGB & 0x00FFFFFF); } + if(!sSecTried) { diff --git a/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch b/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch index 7939b31..9f88f79 100644 --- a/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch +++ b/patches_treble_phh/platform_frameworks_base/0007-Add-support-for-samsung-touch-physical-and-hover-pro.patch @@ -1,7 +1,7 @@ -From 14f642d18be9bb7de7ea4409021880d8ae0c279b Mon Sep 17 00:00:00 2001 +From 489e8a00a23c0dd6fbef5f1e69b2f7ed3fbc04d7 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 12 Aug 2019 23:08:26 +0200 -Subject: [PATCH 07/24] Add support for samsung touch, physical and hover +Subject: [PATCH 07/28] Add support for samsung touch, physical and hover proximity sensor as fallback to real proximity sensor Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865 @@ -10,10 +10,10 @@ Change-Id: I7a0f8b4665c802140d19197d850b77b2a7ac1865 1 file changed, 35 insertions(+) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java -index 1224902aa7be..00fab25350dc 100644 +index f543a562687c..82b1260e79dc 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java -@@ -1700,6 +1700,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call +@@ -1726,6 +1726,27 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call ? Sensor.TYPE_PROXIMITY : SensorUtils.NO_FALLBACK; mProximitySensor = SensorUtils.findSensor(mSensorManager, proxSensor.type, proxSensor.name, fallbackType); @@ -41,7 +41,7 @@ index 1224902aa7be..00fab25350dc 100644 if (mProximitySensor != null) { mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(), TYPICAL_PROXIMITY_THRESHOLD); -@@ -2465,6 +2486,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call +@@ -2491,6 +2512,20 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call public void onSensorChanged(SensorEvent event) { if (mProximitySensorEnabled) { final long time = SystemClock.uptimeMillis(); diff --git a/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch b/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch index 9f19679..d36a1e0 100644 --- a/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch +++ b/patches_treble_phh/platform_frameworks_base/0008-Always-allow-overriding-the-number-of-work-profiles.patch @@ -1,7 +1,7 @@ -From 433f76bd4145480f67496d409e01a0f8b235879f Mon Sep 17 00:00:00 2001 +From e69df4088c108effd45e8741047ee1afd8ca2ce5 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 5 Apr 2020 16:32:46 +0200 -Subject: [PATCH 08/24] Always allow overriding the number of work profiles +Subject: [PATCH 08/28] Always allow overriding the number of work profiles Change-Id: I6eb09aa71663c6fbe7563e3038bffcabdba0ff6a --- diff --git a/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch b/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch index d2f2573..559c504 100644 --- a/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch +++ b/patches_treble_phh/platform_frameworks_base/0009-HOME-deserves-to-wake-up-devices-just-as-well-as-bac.patch @@ -1,7 +1,7 @@ -From 2e867d814f8f7675058085aea23b5cb95f8588f9 Mon Sep 17 00:00:00 2001 +From 901baaf78da74754054309406fb5211170a38552 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 6 Jun 2020 18:21:56 +0200 -Subject: [PATCH 09/24] 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 and menu Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a @@ -10,12 +10,12 @@ Change-Id: Ia562bafd8c620d00c17e8eb338e4701c6c4a3c3a 1 file changed, 1 insertion(+) diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java -index cda9b233576c..bb35e3172165 100644 +index 63fa3323b5b5..b1a845990df3 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java -@@ -1988,6 +1988,7 @@ public class KeyEvent extends InputEvent implements Parcelable { - switch (keyCode) { +@@ -1995,6 +1995,7 @@ public class KeyEvent extends InputEvent implements Parcelable { case KeyEvent.KEYCODE_CAMERA: + case KeyEvent.KEYCODE_FOCUS: case KeyEvent.KEYCODE_MENU: + case KeyEvent.KEYCODE_HOME: case KeyEvent.KEYCODE_PAIRING: diff --git a/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch b/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch index a639392..9de0611 100644 --- a/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch +++ b/patches_treble_phh/platform_frameworks_base/0010-Some-devices-have-proximity-sensor-reporting-NaN-as-.patch @@ -1,7 +1,7 @@ -From acf92f0e0d9efaf2453aacb16b58eccb914094c4 Mon Sep 17 00:00:00 2001 +From 14e1ced9fe14016d081618bb41a451227cd538d8 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 29 Sep 2020 22:39:47 +0200 -Subject: [PATCH 10/24] Some devices have proximity sensor reporting NaN as max +Subject: [PATCH 10/28] Some devices have proximity sensor reporting NaN as max range for some reason. Make them behave standard way by setting 5 cm Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612 @@ -10,10 +10,10 @@ Change-Id: I3c39e3e914a05903c140235702e0480d2d58a612 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java -index 00fab25350dc..3c49a01e00b4 100644 +index 82b1260e79dc..a9de9e1ff19a 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java -@@ -1724,6 +1724,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call +@@ -1750,6 +1750,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call if (mProximitySensor != null) { mProximityThreshold = Math.min(mProximitySensor.getMaximumRange(), TYPICAL_PROXIMITY_THRESHOLD); diff --git a/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch b/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch index c9b691d..9c70656 100644 --- a/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch +++ b/patches_treble_phh/platform_frameworks_base/0011-Fix-brightness-range-not-being-complete-on-Samsung-d.patch @@ -1,7 +1,7 @@ -From cc5cb64f17283c81d884e75ee38ef6c292d3ca46 Mon Sep 17 00:00:00 2001 +From f8fb9e614a976c475edc26770347f9eee623d85c Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 29 Sep 2020 22:40:10 +0200 -Subject: [PATCH 11/24] Fix brightness range not being complete on Samsung +Subject: [PATCH 11/28] Fix brightness range not being complete on Samsung devices On some devices, minimum brightness is 0, which totally messes with @@ -15,10 +15,10 @@ Change-Id: I4d97cbc32490949e83272b81ec6320a5483310b1 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 -index f0ebe290c837..76af7630819c 100644 +index 62d9991254bd..24932bd4d201 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java -@@ -993,9 +993,11 @@ public final class PowerManagerService extends SystemService +@@ -1040,9 +1040,11 @@ public final class PowerManagerService extends SystemService if (min == INVALID_BRIGHTNESS_IN_CONFIG || max == INVALID_BRIGHTNESS_IN_CONFIG || def == INVALID_BRIGHTNESS_IN_CONFIG) { diff --git a/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch b/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch index 5499059..035ed92 100644 --- a/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch +++ b/patches_treble_phh/platform_frameworks_base/0012-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch @@ -1,7 +1,7 @@ -From 42ab9d35ed55b576d7e7257a18fd984c79d63b9b Mon Sep 17 00:00:00 2001 +From ccb4d4cf65dcb79d237caa9192bb863ef5809edd Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 25 Oct 2020 23:57:26 +0100 -Subject: [PATCH 12/24] Re-implement fnmatch-like behaviour for RRO java-side +Subject: [PATCH 12/28] Re-implement fnmatch-like behaviour for RRO java-side Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1 --- diff --git a/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch b/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch index 0773b2d..56ac3ef 100644 --- a/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch +++ b/patches_treble_phh/platform_frameworks_base/0013-Make-rounded-corners-padding-overridable-with-persis.patch @@ -1,7 +1,7 @@ -From 2319811d1b5e5055c236807ce0ff8be759056741 Mon Sep 17 00:00:00 2001 +From 924e19514d9bc0c67c64560fba9d7fc3432e8981 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 6 Dec 2020 12:20:08 +0100 -Subject: [PATCH 13/24] Make rounded corners padding overridable with +Subject: [PATCH 13/28] Make rounded corners padding overridable with persist.sys.phh.rounded_corners_padding Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9 @@ -12,7 +12,7 @@ Change-Id: I481c1c8849b2f22a7cdfb2896a6d3c2e7e3b44d9 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java -index 84b961e7c48a..a5150000f47c 100644 +index d2af6f88915f..3478ec463573 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -22,6 +22,7 @@ import android.content.res.Configuration; @@ -23,7 +23,7 @@ index 84b961e7c48a..a5150000f47c 100644 import android.util.AttributeSet; import android.util.Pair; import android.view.DisplayCutout; -@@ -234,8 +235,10 @@ public class QuickStatusBarHeader extends FrameLayout { +@@ -238,8 +239,10 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu mConfigShowBatteryEstimate = resources.getBoolean(R.bool.config_showBatteryEstimateQSBH); @@ -37,7 +37,7 @@ index 84b961e7c48a..a5150000f47c 100644 int qsOffsetHeight = resources.getDimensionPixelSize( com.android.internal.R.dimen.quick_qs_offset_height); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -index 788665269edb..f9c6ebbd26e3 100644 +index c1191aa71ef4..a32e7c4765ef 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -30,6 +30,7 @@ import android.graphics.Color; @@ -48,10 +48,10 @@ index 788665269edb..f9c6ebbd26e3 100644 import android.util.AttributeSet; import android.util.Pair; import android.util.TypedValue; -@@ -196,8 +197,10 @@ public class KeyguardStatusBarView extends RelativeLayout implements +@@ -193,8 +194,10 @@ public class KeyguardStatusBarView extends RelativeLayout implements + R.dimen.ongoing_appops_dot_min_padding); + mCutoutSideNudge = getResources().getDimensionPixelSize( R.dimen.display_cutout_margin_consumption); - mShowPercentAvailable = getContext().getResources().getBoolean( - com.android.internal.R.bool.config_battery_percentage_setting_available); - mRoundedCornerPadding = res.getDimensionPixelSize( - R.dimen.rounded_corner_content_padding); + mRoundedCornerPadding = SystemProperties.getInt("persist.sys.phh.rounded_corners_padding", -1); diff --git a/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch b/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch index d740e33..54958f9 100644 --- a/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch +++ b/patches_treble_phh/platform_frameworks_base/0014-Remove-useless-notification-about-console-service-be.patch @@ -1,7 +1,7 @@ -From 3e636d6cf6d3f10c5578ba79f8246278b5b1205f Mon Sep 17 00:00:00 2001 +From dd87ec1187b8be38995b734dbdfe3598dfd59cdb Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Fri, 11 Dec 2020 14:41:09 +0100 -Subject: [PATCH 14/24] Remove useless notification about "console" service +Subject: [PATCH 14/28] Remove useless notification about "console" service being running --- diff --git a/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch b/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch index ee5a187..bb6d505 100644 --- a/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch +++ b/patches_treble_phh/platform_frameworks_base/0015-Revert-Remove-unused-SystemProperties.set.patch @@ -1,7 +1,7 @@ -From b78db2908f199c2ecdbb2c9e8f08cc96c399d986 Mon Sep 17 00:00:00 2001 +From bdffa8303310e05d4fba777d5f1e00b62d20db19 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 16 Dec 2020 21:24:12 +0800 -Subject: [PATCH 15/24] Revert "Remove unused SystemProperties.set" +Subject: [PATCH 15/28] Revert "Remove unused SystemProperties.set" This reverts commit debb4616ef67f9ed5054eca51ec58592358ff55f. diff --git a/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch b/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch index e0d6db7..4bb52db 100644 --- a/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch +++ b/patches_treble_phh/platform_frameworks_base/0016-TelephonyManager-bring-back-getNetworkClass.patch @@ -1,7 +1,7 @@ -From 557bd0cca4cee3c3137cba9035eb254772436eae Mon Sep 17 00:00:00 2001 +From 6384008d3e04db21fe384cba9879b915cded98ab Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 16 Dec 2020 13:46:15 +0800 -Subject: [PATCH 16/24] TelephonyManager: bring back getNetworkClass() +Subject: [PATCH 16/28] TelephonyManager: bring back getNetworkClass() This partially reverts commit c058cac051ab083dc7fb7ea6aa85699110b2e9bf. diff --git a/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch b/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch index 2e5add3..1add523 100644 --- a/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch +++ b/patches_treble_phh/platform_frameworks_base/0017-TelephonyManager-add-API-annotations-for-setTelephon.patch @@ -1,7 +1,7 @@ -From b51669eff63818a15122ee274e50792b2772ecba Mon Sep 17 00:00:00 2001 +From 3026abf6ca577e885c2481c39826b16104a49ac2 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 16 Dec 2020 21:26:45 +0800 -Subject: [PATCH 17/24] TelephonyManager: add API annotations for +Subject: [PATCH 17/28] TelephonyManager: add API annotations for setTelephonyProperty * This method was added back by reverting commit diff --git a/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch b/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch index a14dfc5..5ae8ba3 100644 --- a/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch +++ b/patches_treble_phh/platform_frameworks_base/0018-Fix-Wakelock-issue.patch @@ -1,7 +1,7 @@ -From 9b926fe1972bf2f8139a8a00b2f452d4e3cabdea Mon Sep 17 00:00:00 2001 +From 78a5652a8d86f51f479ced7b08864fe71f630905 Mon Sep 17 00:00:00 2001 From: Alberto Ponces Date: Tue, 2 Feb 2021 10:20:51 +0000 -Subject: [PATCH 18/24] Fix Wakelock issue +Subject: [PATCH 18/28] Fix Wakelock issue Prevent SystemUI crash due to "WakeLock under-locked Doze" (issue #12) by only releasing a wakelock that was not already released --- diff --git a/patches_treble_phh/platform_frameworks_base/0019-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch b/patches_treble_phh/platform_frameworks_base/0019-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch index 3898e72..10f7364 100644 --- a/patches_treble_phh/platform_frameworks_base/0019-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch +++ b/patches_treble_phh/platform_frameworks_base/0019-SystemUI-Use-AVCProfileMain-for-screen-recorder.patch @@ -1,7 +1,7 @@ -From ec9c979cb9c2399380292d775d068ce596ba855d Mon Sep 17 00:00:00 2001 +From 2cb4389377b69c5e53101536333838c6aa63d4fa Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Thu, 5 Nov 2020 05:38:44 +0100 -Subject: [PATCH 19/24] SystemUI: Use AVCProfileMain for screen recorder +Subject: [PATCH 19/28] SystemUI: Use AVCProfileMain for screen recorder Some devices don't support the High profile very well. Use Main profile, which is more compatible, so they diff --git a/patches_treble_phh/platform_frameworks_base/0020-Automatically-detect-pick-up-sensor-so-that-an-overl.patch b/patches_treble_phh/platform_frameworks_base/0020-Automatically-detect-pick-up-sensor-so-that-an-overl.patch index 426e27a..751dcb9 100644 --- a/patches_treble_phh/platform_frameworks_base/0020-Automatically-detect-pick-up-sensor-so-that-an-overl.patch +++ b/patches_treble_phh/platform_frameworks_base/0020-Automatically-detect-pick-up-sensor-so-that-an-overl.patch @@ -1,7 +1,7 @@ -From e63f6286978d095c26a24253b503c3964db6ab68 Mon Sep 17 00:00:00 2001 +From 357f0fac32fc59b8f6349febd3a65f2ffb820279 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 20 Mar 2021 14:31:01 +0100 -Subject: [PATCH 20/24] Automatically detect pick up sensor, so that an overlay +Subject: [PATCH 20/28] Automatically detect pick up sensor, so that an overlay is required for the sole purpose of enabling pulse doze on pick up sensor --- diff --git a/patches_treble_phh/platform_frameworks_base/0021-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch b/patches_treble_phh/platform_frameworks_base/0021-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch index 0f12dad..b1ed391 100644 --- a/patches_treble_phh/platform_frameworks_base/0021-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch +++ b/patches_treble_phh/platform_frameworks_base/0021-Catch-broken-mainBuiltInDisplayCutoutRectApproximati.patch @@ -1,7 +1,7 @@ -From 69a948909ec0ac6d2fb89fdfeadee0df09437df0 Mon Sep 17 00:00:00 2001 +From f4f5e6173024f2057f4d4ffcdc77028d03b004e2 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 23 Mar 2021 19:43:26 +0100 -Subject: [PATCH 21/24] Catch broken mainBuiltInDisplayCutoutRectApproximation +Subject: [PATCH 21/28] Catch broken mainBuiltInDisplayCutoutRectApproximation Some devices (Redmi Note 9T) have: mainBuiltInDisplayCutoutRectApproximation = @android:mainBuiltInDisplayCutout diff --git a/patches_treble_phh/platform_frameworks_base/0022-backlight-Fix-backlight-control-on-Galaxy-S9.patch b/patches_treble_phh/platform_frameworks_base/0022-backlight-Fix-backlight-control-on-Galaxy-S9.patch index 689db9a..fd5f38c 100644 --- a/patches_treble_phh/platform_frameworks_base/0022-backlight-Fix-backlight-control-on-Galaxy-S9.patch +++ b/patches_treble_phh/platform_frameworks_base/0022-backlight-Fix-backlight-control-on-Galaxy-S9.patch @@ -1,7 +1,7 @@ -From 97d62e3f56c39729d3756166599999216fbc2639 Mon Sep 17 00:00:00 2001 +From 0935d80aa90b9575b77bd55a37432a5f4a6c3747 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 24 Mar 2018 08:01:48 +0100 -Subject: [PATCH 22/24] backlight: Fix backlight control on Galaxy S9(+) +Subject: [PATCH 22/28] backlight: Fix backlight control on Galaxy S9(+) Change-Id: I1fbbb47939c377597ef8ad6b88b2acea5f4acaa6 @@ -53,10 +53,10 @@ Change-Id: I4e85178327d2bb63d5d0a37786058843662a89ba 1 file changed, 46 insertions(+) diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java -index 91f14de040fe..8fa9c4f3a698 100644 +index fea6b29d9260..caf9eba7d9a8 100644 --- a/services/core/java/com/android/server/lights/LightsService.java +++ b/services/core/java/com/android/server/lights/LightsService.java -@@ -31,6 +31,7 @@ import android.os.IBinder; +@@ -32,6 +32,7 @@ import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; import android.os.ServiceManager; @@ -64,7 +64,7 @@ index 91f14de040fe..8fa9c4f3a698 100644 import android.os.Trace; import android.provider.Settings; import android.util.Slog; -@@ -294,6 +295,51 @@ public class LightsService extends SystemService { +@@ -295,6 +296,51 @@ public class LightsService extends SystemService { return; } int brightnessInt = BrightnessSynchronizer.brightnessFloatToInt(brightness); diff --git a/patches_treble_phh/platform_frameworks_base/0023-Add-support-for-app-signature-spoofing.patch b/patches_treble_phh/platform_frameworks_base/0023-Add-support-for-app-signature-spoofing.patch index 860ffb1..5248915 100644 --- a/patches_treble_phh/platform_frameworks_base/0023-Add-support-for-app-signature-spoofing.patch +++ b/patches_treble_phh/platform_frameworks_base/0023-Add-support-for-app-signature-spoofing.patch @@ -1,7 +1,7 @@ -From 38da0b29efb2577ebd9295a45617160e3caec696 Mon Sep 17 00:00:00 2001 +From 7b0c25ae3dfe6af5d9d9a2b2518964f7c5f034bf Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 16 Oct 2021 05:27:57 -0700 -Subject: [PATCH 23/24] Add support for app signature spoofing +Subject: [PATCH 23/28] Add support for app signature spoofing This is needed by microG GmsCore to pretend to be the official Google Play Services package, because client apps check the package signature @@ -56,10 +56,10 @@ index 1de47b548a5c..52c7ea2e1321 100644 field public static final String MICROPHONE = "android.permission-group.MICROPHONE"; field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index cd6af189a04a..318a7f06494e 100644 +index 76b8547cea2a..8bd3206d1e3a 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -3189,6 +3189,21 @@ +@@ -3199,6 +3199,21 @@ android:description="@string/permdesc_getPackageSize" android:protectionLevel="normal" /> @@ -105,7 +105,7 @@ index b58638cc3ade..8cf98fa56bf6 100644 disable or modify status bar diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index b77483012ee8..04f55ae83ef0 100644 +index f69922f64787..7d0ba265ff7e 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -3325,6 +3325,29 @@ public class PackageManagerService extends IPackageManager.Stub diff --git a/patches_treble_phh/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch b/patches_treble_phh/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch index 8636483..e6170f4 100644 --- a/patches_treble_phh/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch +++ b/patches_treble_phh/platform_frameworks_base/0024-Revert-Switch-long-press-power-behavior-in-AOSP.patch @@ -1,7 +1,7 @@ -From 4881811426c4f2f28d1f053ef73441c53d1238a5 Mon Sep 17 00:00:00 2001 +From 7003808f45a75893726d4073da9132c314091e98 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 4 Sep 2021 08:26:30 +0000 -Subject: [PATCH 24/24] Revert "Switch long-press power behavior in AOSP." +Subject: [PATCH 24/28] Revert "Switch long-press power behavior in AOSP." This reverts commit 803c77a0a24624111944832098c6f65158051dc4. --- @@ -9,19 +9,19 @@ This reverts commit 803c77a0a24624111944832098c6f65158051dc4. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 0abeff91e511..b7dfd49b7b78 100644 +index 380f2b362668..3ce1886fef6d 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -955,7 +955,7 @@ - 4 - Go to voice assist +@@ -956,7 +956,7 @@ 5 - Go to assistant (Settings.Secure.ASSISTANT) + 6 - Toggle torch on / off (if screen is off) --> - 5 + 1 500 -@@ -987,7 +987,7 @@ +@@ -988,7 +988,7 @@ 1 - Mute toggle 2 - Global actions menu --> diff --git a/patches_treble_phh/platform_frameworks_base/0025-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch b/patches_treble_phh/platform_frameworks_base/0025-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch new file mode 100644 index 0000000..fab902c --- /dev/null +++ b/patches_treble_phh/platform_frameworks_base/0025-Reduce-the-size-of-udfps-enroll-progress-bar.-Some-d.patch @@ -0,0 +1,28 @@ +From 72faf5ce1446d48e39961177519c92359e066312 Mon Sep 17 00:00:00 2001 +From: Pierre-Hugues Husson +Date: Fri, 17 Dec 2021 17:16:14 -0500 +Subject: [PATCH 25/28] Reduce the size of udfps enroll progress bar. Some + devices have their udfps pretty low, and the progress bar would make the icon + at the wrong place + +Change-Id: I1609ad9ca316293dcaaf07f7e681d11aadfcd29c +--- + packages/SystemUI/res/values/config.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml +index dbbb54f7ad6e..d0098b32f384 100644 +--- a/packages/SystemUI/res/values/config.xml ++++ b/packages/SystemUI/res/values/config.xml +@@ -637,7 +637,7 @@ + + + +- 280 ++ 70 + + + +- false ++ true + +-- +2.25.1 +