commit cd68e3dcbc50a78d6733cc3fd88009350d61b9d2 Author: Andy CrossGate Yan Date: Fri Nov 11 12:27:50 2022 +0000 Initial unified commit for Android 13, with TrebleDroid GSI target, syncing up to 20221111 diff --git a/patches_platform/build_make/0001-build-Remove-llkd.patch b/patches_platform/build_make/0001-build-Remove-llkd.patch new file mode 100644 index 0000000..e2217d5 --- /dev/null +++ b/patches_platform/build_make/0001-build-Remove-llkd.patch @@ -0,0 +1,27 @@ +From 90eaa68455703e85c5f97d0b13945bd04351e24c Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Thu, 14 Oct 2021 12:20:52 +0000 +Subject: [PATCH] build: Remove llkd + +...until someone figures out why Genshin Impact fails it + +Change-Id: I29384a820a0c07b29d3f11d7039bed40eeaee926 +--- + target/product/base_system.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/target/product/base_system.mk b/target/product/base_system.mk +index b5b41f3be..c18a6dc03 100644 +--- a/target/product/base_system.mk ++++ b/target/product/base_system.mk +@@ -195,7 +195,6 @@ PRODUCT_PACKAGES += \ + libwilhelm \ + linker \ + linkerconfig \ +- llkd \ + lmkd \ + LocalTransport \ + locksettings \ +-- +2.25.1 + 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..5d55b17 --- /dev/null +++ b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch @@ -0,0 +1,126 @@ +From b94084cca9202c12ea41de9f6f23785c818a64c0 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Thu, 13 Jan 2022 14:22:24 +0000 +Subject: [PATCH 01/12] Add SPenPointerOverlay + +Toggle this overlay with property "persist.ui.spen.pointer" + +Change-Id: I21f7e05cf8ebd74c950dfb20cf7eee99bfe22988 +--- + packages/overlays/Android.mk | 1 + + .../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, 57 insertions(+) + 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 69641e69a9f2..36ec11af3068 100644 +--- a/packages/overlays/Android.mk ++++ b/packages/overlays/Android.mk +@@ -31,6 +31,7 @@ LOCAL_REQUIRED_MODULES := \ + NavigationBarModeGesturalOverlayNarrowBack \ + NavigationBarModeGesturalOverlayWideBack \ + NavigationBarModeGesturalOverlayExtraWideBack \ ++ 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/0002-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch new file mode 100644 index 0000000..1b12f9d --- /dev/null +++ b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch @@ -0,0 +1,40 @@ +From 5d4c54f6956862135a6066f4c0e322690145cce8 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Thu, 5 Apr 2018 10:01:19 +0800 +Subject: [PATCH 02/12] Disable vendor mismatch warning + +Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b +--- + .../server/wm/ActivityTaskManagerService.java | 16 ++-------------- + 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 43b66d181326..1f0d60cf3a38 100644 +--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java ++++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +@@ -5696,20 +5696,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { + } + + if (!Build.isBuildConsistent()) { +- Slog.e(TAG, "Build fingerprint is not consistent, warning user"); +- mUiHandler.post(() -> { +- if (mShowDialogs) { +- AlertDialog d = new BaseErrorDialog(mUiContext); +- d.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR); +- d.setCancelable(false); +- d.setTitle(mUiContext.getText(R.string.android_system_label)); +- d.setMessage(mUiContext.getText(R.string.system_error_manufacturer)); +- d.setButton(DialogInterface.BUTTON_POSITIVE, +- mUiContext.getText(R.string.ok), +- mUiHandler.obtainMessage(DISMISS_DIALOG_UI_MSG, d)); +- d.show(); +- } +- }); ++ Slog.e(TAG, "Build fingerprint is not consistent"); ++ // Do not emit warning about vendor mismatch + } + } + } +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch b/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch new file mode 100644 index 0000000..0bc6819 --- /dev/null +++ b/patches_platform/frameworks_base/0003-UI-Adjust-default-navbar-layouts.patch @@ -0,0 +1,62 @@ +From 4dc4d1ec5be6658812b82c09d745975674707572 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sat, 16 Oct 2021 02:23:48 +0000 +Subject: [PATCH 03/12] UI: Adjust default navbar layouts + +- Slightly tighten nodpi layout +- Remove sw372dp layout - looks terrible, probably meant for legacy phablets, but most modern phones qualify + +Change-Id: Ia32f5d92e6c9e36560c53e7dffce7d2c29a81fe5 +--- + .../SystemUI/res/values-sw372dp/config.xml | 25 ------------------- + packages/SystemUI/res/values/config.xml | 2 +- + 2 files changed, 1 insertion(+), 26 deletions(-) + delete mode 100644 packages/SystemUI/res/values-sw372dp/config.xml + +diff --git a/packages/SystemUI/res/values-sw372dp/config.xml b/packages/SystemUI/res/values-sw372dp/config.xml +deleted file mode 100644 +index 07b797a32428..000000000000 +--- a/packages/SystemUI/res/values-sw372dp/config.xml ++++ /dev/null +@@ -1,25 +0,0 @@ +- +- +- +- +- +- +- 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 ba31e7f1f1d1..c4625e7e784d 100644 +--- a/packages/SystemUI/res/values/config.xml ++++ b/packages/SystemUI/res/values/config.xml +@@ -307,7 +307,7 @@ + + + +- left[.5W],back[1WC];home;recent[1WC],right[.5W] ++ left[.6W],back[1WC];home;recent[1WC],right[.6W] + back[1.7WC];home;contextual[1.7WC] + back[70AC];home_handle;ime_switcher[70AC] + +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch new file mode 100644 index 0000000..ec6e319 --- /dev/null +++ b/patches_platform/frameworks_base/0004-UI-Disable-wallpaper-zoom.patch @@ -0,0 +1,28 @@ +From 06c01a490bf6379a8f9d8e4e8499add7a4ea2cbc Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 10 Jan 2021 11:44:29 +0000 +Subject: [PATCH 04/12] UI: Disable wallpaper zoom + +It does little more than inducing motion sickness + +Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0 +--- + core/res/res/values/config.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml +index 34b5589bf81f..be2dbc3cd5dc 100644 +--- a/core/res/res/values/config.xml ++++ b/core/res/res/values/config.xml +@@ -5029,7 +5029,7 @@ + 1 + + +- 1.10 ++ 1 + + + false +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0005-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch b/patches_platform/frameworks_base/0005-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch new file mode 100644 index 0000000..b674425 --- /dev/null +++ b/patches_platform/frameworks_base/0005-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch @@ -0,0 +1,39 @@ +From 202ed6730a9b3182c33ef3d5169ff026ab269a2a Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 25 Sep 2022 02:20:52 +0000 +Subject: [PATCH 05/12] UI: Follow Monet and light/dark theme in user 1 icon + +Change-Id: I755077c6003c39ddc9428da1defe6a6ddd0e5ff8 +--- + core/res/res/values-night/colors.xml | 1 + + core/res/res/values/colors.xml | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml +index 33c9b95c5819..f3531caa47d9 100644 +--- a/core/res/res/values-night/colors.xml ++++ b/core/res/res/values-night/colors.xml +@@ -33,6 +33,7 @@ + + @color/overview_background_dark + ++ @color/system_accent1_100 + #fff439a0 + #ff4ecde6 + #fffbbc04 +diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml +index b515abc4000f..87a4bb9da02b 100644 +--- a/core/res/res/values/colors.xml ++++ b/core/res/res/values/colors.xml +@@ -174,7 +174,7 @@ + #00000000 + + +- #ffe46962 ++ @color/system_accent1_600 + #ffaf5cf7 + #ff4c8df6 + #fff439a0 +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch new file mode 100644 index 0000000..f8c698b --- /dev/null +++ b/patches_platform/frameworks_base/0006-UI-Increase-default-status-bar-height.patch @@ -0,0 +1,35 @@ +From 448d7cb6f0689082ec63820f72e8ef221154fcfd Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Wed, 3 Jun 2020 01:31:34 +0000 +Subject: [PATCH 06/12] UI: Increase default status bar height + +Change-Id: Ibbcf63159e19bb2bb2b1094ea07ab85917630b07 +--- + core/res/res/values/dimens.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml +index b754100a3ed6..1851b42c0f3b 100644 +--- a/core/res/res/values/dimens.xml ++++ b/core/res/res/values/dimens.xml +@@ -41,7 +41,7 @@ + + +- 24dp ++ 28dp + +@@ -49,7 +49,7 @@ + +- 24dp ++ 28dp + +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0007-UI-Remove-QS-footer-background.patch b/patches_platform/frameworks_base/0007-UI-Remove-QS-footer-background.patch new file mode 100644 index 0000000..936d5a9 --- /dev/null +++ b/patches_platform/frameworks_base/0007-UI-Remove-QS-footer-background.patch @@ -0,0 +1,25 @@ +From 057673be164d2bc9cefbe2161bb8293909e72ae6 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 25 Sep 2022 02:20:20 +0000 +Subject: [PATCH 07/12] UI: Remove QS footer background + +Change-Id: I68e82e0c5e3eddb2d3f767fe792b1436eae506ef +--- + packages/SystemUI/res-keyguard/layout/footer_actions.xml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/packages/SystemUI/res-keyguard/layout/footer_actions.xml b/packages/SystemUI/res-keyguard/layout/footer_actions.xml +index 876f275ab042..497181d9ee03 100644 +--- a/packages/SystemUI/res-keyguard/layout/footer_actions.xml ++++ b/packages/SystemUI/res-keyguard/layout/footer_actions.xml +@@ -24,7 +24,6 @@ + android:elevation="@dimen/qs_panel_elevation" + android:paddingTop="8dp" + android:paddingBottom="@dimen/qs_footer_actions_bottom_padding" +- android:background="@drawable/qs_footer_actions_background" + android:gravity="center_vertical" + android:layout_gravity="bottom" + > +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch b/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch new file mode 100644 index 0000000..eb2c1e7 --- /dev/null +++ b/patches_platform/frameworks_base/0008-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch @@ -0,0 +1,56 @@ +From e5ac2b04e10ce9b900e9a3ca0c1c609a26e4aaee Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sat, 19 Mar 2022 09:22:24 +0000 +Subject: [PATCH 08/12] UI: Restore split-screen divider to pre-Sv2 looks + +- Kill rounded corners - where two rectangles collide should be perfectly straight +- Make it black again - taskbar should mind its own business + +Change-Id: I240b627793b615c82bd07ebd77638cde180ef80f +--- + .../Shell/res/color/split_divider_background.xml | 4 ++-- + .../wm/shell/common/split/SplitLayout.java | 15 +-------------- + 2 files changed, 3 insertions(+), 16 deletions(-) + +diff --git a/libs/WindowManager/Shell/res/color/split_divider_background.xml b/libs/WindowManager/Shell/res/color/split_divider_background.xml +index 049980803ee3..cd54ac26a7fd 100644 +--- a/libs/WindowManager/Shell/res/color/split_divider_background.xml ++++ b/libs/WindowManager/Shell/res/color/split_divider_background.xml +@@ -15,5 +15,5 @@ + ~ limitations under the License. + --> + +- +- +\ No newline at end of file ++ ++ +diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java +index c94455d9151a..5eedb1fdb824 100644 +--- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java ++++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java +@@ -138,20 +138,7 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange + } + + private int getDividerInsets(Resources resources, Display display) { +- final int dividerInset = resources.getDimensionPixelSize( +- com.android.internal.R.dimen.docked_stack_divider_insets); +- +- int radius = 0; +- RoundedCorner corner = display.getRoundedCorner(RoundedCorner.POSITION_TOP_LEFT); +- radius = corner != null ? Math.max(radius, corner.getRadius()) : radius; +- corner = display.getRoundedCorner(RoundedCorner.POSITION_TOP_RIGHT); +- radius = corner != null ? Math.max(radius, corner.getRadius()) : radius; +- corner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_RIGHT); +- radius = corner != null ? Math.max(radius, corner.getRadius()) : radius; +- corner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_LEFT); +- radius = corner != null ? Math.max(radius, corner.getRadius()) : radius; +- +- return Math.max(dividerInset, radius); ++ return 0; + } + + /** Gets bounds of the primary split with screen based coordinate. */ +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch new file mode 100644 index 0000000..bce85f3 --- /dev/null +++ b/patches_platform/frameworks_base/0009-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -0,0 +1,64 @@ +From d9518a3ec3b88c36f16d8a7417d1d2c29bec25fc Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Tue, 6 Oct 2020 01:41:16 +0000 +Subject: [PATCH 09/12] 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 51feed875337..5f0f9a220c31 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/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch new file mode 100644 index 0000000..f14392a --- /dev/null +++ b/patches_platform/frameworks_base/0010-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -0,0 +1,95 @@ +From 1556f8d5c97d6fdec1099d6c587a2cac128d4f97 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 26 Apr 2020 08:56:13 +0000 +Subject: [PATCH 10/12] UI: Use SNAP_FIXED_RATIO for multi-window globally + +Enables multiple snap targets under landscape for phone UI + +Change-Id: I36e08f1e277dca0b0f9f99418671026e61b01496 +--- + core/res/res/values-land/config.xml | 19 ------------------- + core/res/res/values-sw600dp/config.xml | 18 ++++++++---------- + core/res/res/values/config.xml | 2 +- + 3 files changed, 9 insertions(+), 30 deletions(-) + delete mode 100644 core/res/res/values-land/config.xml + +diff --git a/core/res/res/values-land/config.xml b/core/res/res/values-land/config.xml +deleted file mode 100644 +index 7308dc5882c1..000000000000 +--- a/core/res/res/values-land/config.xml ++++ /dev/null +@@ -1,19 +0,0 @@ +- +- +- +- 2 +- +\ No newline at end of file +diff --git a/core/res/res/values-sw600dp/config.xml b/core/res/res/values-sw600dp/config.xml +index d686dd2ea690..03dcf51846dd 100644 +--- a/core/res/res/values-sw600dp/config.xml ++++ b/core/res/res/values-sw600dp/config.xml +@@ -3,16 +3,16 @@ + /* + ** Copyright 2009, 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 ++** 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 ++** 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 ++** 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. + */ + --> +@@ -40,8 +40,6 @@ + + 32mm + +- 1 +- + + false +diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml +index be2dbc3cd5dc..c62cce393ff0 100644 +--- a/core/res/res/values/config.xml ++++ b/core/res/res/values/config.xml +@@ -3726,7 +3726,7 @@ + 1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio) + 2 - 1 snap target: 1:1 + --> +- 0 ++ 1 + + +-- +2.25.1 + diff --git a/patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch b/patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch new file mode 100644 index 0000000..5c88cf5 --- /dev/null +++ b/patches_platform/frameworks_base/0011-core-Remove-old-app-target-SDK-dialog.patch @@ -0,0 +1,31 @@ +From f7e374407e133b9c53ecfbc9a5dc99a1460b6eb0 Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Tue, 3 Nov 2020 22:43:12 -0800 +Subject: [PATCH 11/12] 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/0012-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0012-Paint-Enable-subpixel-text-positioning-by-default.patch new file mode 100644 index 0000000..4c93f68 --- /dev/null +++ b/patches_platform/frameworks_base/0012-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -0,0 +1,41 @@ +From 1e6d2e5f957d1a0f497248d1673d9ecaa1a676a3 Mon Sep 17 00:00:00 2001 +From: Danny Lin +Date: Tue, 5 Oct 2021 21:01:50 -0700 +Subject: [PATCH 12/12] 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 +displays have relatively high DPIs, the lack of subpixel text +positioning is only unnoticeable on high-end devices such as the Pixel 4 +XL (1440x3040 @ 6.3 in => 537 dpi). + +For example, on the Pixel 5 (1080 x 2340 @ 6.0 in => 432 dpi), +horizontally-scrolling labels in QS tiles can be seen "jittering" +slightly upon close observation. This was tested with the Google Sans +font on Google's stock OS. At this lower DPI, there is still a need for +subpixel text positioning (at least in some cases). + +Enable subpixel text positioning by default to fix occasional kerning +issues and jittering when text is in motion. + +Change-Id: I8d71e5848a745c5a2d457a28c68458920928ee09 +--- + graphics/java/android/graphics/Paint.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java +index 451b99ea7550..e60d506a171b 100644 +--- a/graphics/java/android/graphics/Paint.java ++++ b/graphics/java/android/graphics/Paint.java +@@ -253,7 +253,7 @@ public class Paint { + + // These flags are always set on a new/reset paint, even if flags 0 is passed. + static final int HIDDEN_DEFAULT_PAINT_FLAGS = DEV_KERN_TEXT_FLAG | EMBEDDED_BITMAP_TEXT_FLAG +- | FILTER_BITMAP_FLAG; ++ | FILTER_BITMAP_FLAG | SUBPIXEL_TEXT_FLAG; + + /** + * Font hinter option that disables font hinting. +-- +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_Jelly/0001-Jelly-MainActivity-Restore-applyThemeColor.patch b/patches_platform/packages_apps_Jelly/0001-Jelly-MainActivity-Restore-applyThemeColor.patch new file mode 100644 index 0000000..3e73742 --- /dev/null +++ b/patches_platform/packages_apps_Jelly/0001-Jelly-MainActivity-Restore-applyThemeColor.patch @@ -0,0 +1,34 @@ +From b63b5c1fb46eaf032270bbb65b9a61fe487c5e46 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sat, 26 Jun 2021 14:23:09 +0000 +Subject: [PATCH] Jelly: MainActivity: Restore applyThemeColor + +Fixes black statusbar on start + +Change-Id: I6816f5b1dcb3c7bcaee2736a9e2a3ecd63217bc6 +--- + app/src/main/java/org/lineageos/jelly/MainActivity.kt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/app/src/main/java/org/lineageos/jelly/MainActivity.kt b/app/src/main/java/org/lineageos/jelly/MainActivity.kt +index 0143957..af7191c 100644 +--- a/app/src/main/java/org/lineageos/jelly/MainActivity.kt ++++ b/app/src/main/java/org/lineageos/jelly/MainActivity.kt +@@ -192,6 +192,7 @@ class MainActivity : WebViewExtActivity(), SearchBarController.OnCancelListener, + findViewById(R.id.search_menu_cancel), + this) + setUiMode() ++ applyThemeColor(mThemeColor) + try { + val httpCacheDir = File(cacheDir, "suggestion_responses") + val httpCacheSize = 1024 * 1024.toLong() // 1 MiB +@@ -726,4 +727,4 @@ class MainActivity : WebViewExtActivity(), SearchBarController.OnCancelListener, + private const val STATE_KEY_THEME_COLOR = "theme_color" + private const val LOCATION_PERM_REQ = 424 + } +-} +\ No newline at end of file ++} +-- +2.25.1 + 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..68b8161 --- /dev/null +++ b/patches_platform/packages_apps_LineageParts/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch @@ -0,0 +1,105 @@ +From 9ee8209308b775f6cd4a104fe1cd89c9645e4742 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 9340e57..63a4b71 100644 +--- a/res/values-zh-rCN/strings.xml ++++ b/res/values-zh-rCN/strings.xml +@@ -434,9 +434,9 @@ + 90 度 + 180 度 + 270 度 +- 全屏应用 +- 强制旧式应用程序使用全屏长宽比 +- 无应用 ++ 禁用拉伸全屏 ++ 对选定的应用禁用拉伸全屏 ++ 无应用 + 充电提示音 + 启用充电提示音 + 连接或断开电源时发出声音 +diff --git a/res/values/strings.xml b/res/values/strings.xml +index 9fe4181..998a5f6 100644 +--- a/res/values/strings.xml ++++ b/res/values/strings.xml +@@ -567,9 +567,9 @@ + 270 degrees + + +- 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 803b214..6f61e9d 100644 +--- a/res/xml/parts_catalog.xml ++++ b/res/xml/parts_catalog.xml +@@ -81,8 +81,8 @@ + lineage:xmlRes="@xml/power_menu_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_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch b/patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch new file mode 100644 index 0000000..a02dfeb --- /dev/null +++ b/patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch @@ -0,0 +1,223 @@ +From 3f7f3f9546f9f23d66381f7dff887cd562285ce6 Mon Sep 17 00:00:00 2001 +From: Paul Keith +Date: Tue, 30 Oct 2018 15:46:18 +0100 +Subject: [PATCH] Messaging: Add "Mark as read" quick action for message + notifications + +Change-Id: I7194dca022e5062926fa35709de282721ca64320 +--- + res/drawable/ic_wear_read.xml | 9 +++++++++ + res/values/cm_strings.xml | 3 +++ + .../messaging/datamodel/BugleNotifications.java | 14 ++++++++++++++ + .../datamodel/MessageNotificationState.java | 8 ++++++++ + .../messaging/datamodel/NotificationState.java | 12 +++++++++++- + .../messaging/receiver/NotificationReceiver.java | 12 +++++++++++- + src/com/android/messaging/ui/UIIntents.java | 11 +++++++++++ + src/com/android/messaging/ui/UIIntentsImpl.java | 14 ++++++++++++++ + 8 files changed, 81 insertions(+), 2 deletions(-) + create mode 100644 res/drawable/ic_wear_read.xml + +diff --git a/res/drawable/ic_wear_read.xml b/res/drawable/ic_wear_read.xml +new file mode 100644 +index 0000000..9d017e6 +--- /dev/null ++++ b/res/drawable/ic_wear_read.xml +@@ -0,0 +1,9 @@ ++ ++ ++ +diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml +index f285555..858f093 100644 +--- a/res/values/cm_strings.xml ++++ b/res/values/cm_strings.xml +@@ -23,6 +23,9 @@ + Emoticons access + Show the emoticons key on the keyboard + ++ ++ Mark as read ++ + + Messages + +diff --git a/src/com/android/messaging/datamodel/BugleNotifications.java b/src/com/android/messaging/datamodel/BugleNotifications.java +index 6df9e88..dbe86ff 100644 +--- a/src/com/android/messaging/datamodel/BugleNotifications.java ++++ b/src/com/android/messaging/datamodel/BugleNotifications.java +@@ -789,6 +789,7 @@ public class BugleNotifications { + (MultiMessageNotificationState) notificationState); + addDownloadMmsAction(notifBuilder, wearableExtender, notificationState); + addWearableVoiceReplyAction(notifBuilder, wearableExtender, notificationState); ++ addReadAction(notifBuilder, wearableExtender, notificationState); + } + + // Apply the wearable options and build & post the notification +@@ -876,6 +877,19 @@ public class BugleNotifications { + wearableExtender.addAction(wearActionBuilder.build()); + } + ++ private static void addReadAction(final NotificationCompat.Builder notifBuilder, ++ final WearableExtender wearableExtender, final NotificationState notificationState) { ++ final Context context = Factory.get().getApplicationContext(); ++ final PendingIntent readPendingIntent = notificationState.getReadIntent(); ++ final NotificationCompat.Action.Builder readActionBuilder = ++ new NotificationCompat.Action.Builder(R.drawable.ic_wear_read, ++ context.getString(R.string.notification_mark_as_read), readPendingIntent); ++ notifBuilder.addAction(readActionBuilder.build()); ++ ++ // Support the action on a wearable device as well ++ wearableExtender.addAction(readActionBuilder.build()); ++ } ++ + private static void addDownloadMmsAction(final NotificationCompat.Builder notifBuilder, + final WearableExtender wearableExtender, final NotificationState notificationState) { + if (!(notificationState instanceof MultiMessageNotificationState)) { +diff --git a/src/com/android/messaging/datamodel/MessageNotificationState.java b/src/com/android/messaging/datamodel/MessageNotificationState.java +index 4a4bfd5..7555d97 100644 +--- a/src/com/android/messaging/datamodel/MessageNotificationState.java ++++ b/src/com/android/messaging/datamodel/MessageNotificationState.java +@@ -334,6 +334,14 @@ public abstract class MessageNotificationState extends NotificationState { + getClearIntentRequestCode()); + } + ++ @Override ++ public PendingIntent getReadIntent() { ++ return UIIntents.get().getPendingIntentForMarkingAsRead( ++ Factory.get().getApplicationContext(), ++ mConversationIds, ++ getReadIntentRequestCode()); ++ } ++ + /** + * Notification for multiple messages in at least 2 different conversations. + */ +diff --git a/src/com/android/messaging/datamodel/NotificationState.java b/src/com/android/messaging/datamodel/NotificationState.java +index 144f0fe..4c11537 100644 +--- a/src/com/android/messaging/datamodel/NotificationState.java ++++ b/src/com/android/messaging/datamodel/NotificationState.java +@@ -43,7 +43,8 @@ import java.util.HashSet; + public abstract class NotificationState { + private static final int CONTENT_INTENT_REQUEST_CODE_OFFSET = 0; + private static final int CLEAR_INTENT_REQUEST_CODE_OFFSET = 1; +- private static final int NUM_REQUEST_CODES_NEEDED = 2; ++ private static final int READ_INTENT_REQUEST_CODE_OFFSET = 2; ++ private static final int NUM_REQUEST_CODES_NEEDED = 3; + + public interface FailedMessageQuery { + static final String FAILED_MESSAGES_WHERE_CLAUSE = +@@ -78,6 +79,11 @@ public abstract class NotificationState { + */ + public abstract PendingIntent getClearIntent(); + ++ /** ++ * The intent to be triggered when mark as read is pressed. ++ */ ++ public abstract PendingIntent getReadIntent(); ++ + protected Uri getAttachmentUri() { + return null; + } +@@ -116,6 +122,10 @@ public abstract class NotificationState { + return mBaseRequestCode + CLEAR_INTENT_REQUEST_CODE_OFFSET; + } + ++ public int getReadIntentRequestCode() { ++ return mBaseRequestCode + READ_INTENT_REQUEST_CODE_OFFSET; ++ } ++ + /** + * Gets the appropriate icon needed for notifications. + */ +diff --git a/src/com/android/messaging/receiver/NotificationReceiver.java b/src/com/android/messaging/receiver/NotificationReceiver.java +index bbb847d..f87779c 100644 +--- a/src/com/android/messaging/receiver/NotificationReceiver.java ++++ b/src/com/android/messaging/receiver/NotificationReceiver.java +@@ -20,6 +20,7 @@ import android.content.Context; + import android.content.Intent; + + import com.android.messaging.datamodel.BugleNotifications; ++import com.android.messaging.datamodel.action.MarkAsReadAction; + import com.android.messaging.datamodel.action.MarkAsSeenAction; + import com.android.messaging.ui.UIIntents; + import com.android.messaging.util.ConversationIdSet; +@@ -52,6 +53,15 @@ public class NotificationReceiver extends BroadcastReceiver { + BugleNotifications.resetLastMessageDing(conversationId); + } + } ++ } else if (intent.getAction().equals(UIIntents.ACTION_MARK_AS_READ)) { ++ final String conversationIdSetString = ++ intent.getStringExtra(UIIntents.UI_INTENT_EXTRA_CONVERSATION_ID_SET); ++ if (conversationIdSetString != null) { ++ for (final String conversationId : ++ ConversationIdSet.createSet(conversationIdSetString)) { ++ MarkAsReadAction.markAsRead(conversationId); ++ } ++ } + } + } +-} +\ No newline at end of file ++} +diff --git a/src/com/android/messaging/ui/UIIntents.java b/src/com/android/messaging/ui/UIIntents.java +index 2d10527..144e831 100644 +--- a/src/com/android/messaging/ui/UIIntents.java ++++ b/src/com/android/messaging/ui/UIIntents.java +@@ -69,6 +69,9 @@ public abstract class UIIntents { + public static final String ACTION_RESET_NOTIFICATIONS = + "com.android.messaging.reset_notifications"; + ++ public static final String ACTION_MARK_AS_READ = ++ "com.android.messaging.mark_as_read"; ++ + // Sending VCard uri to VCard detail activity + public static final String UI_INTENT_EXTRA_VCARD_URI = "vcard_uri"; + +@@ -323,6 +326,14 @@ public abstract class UIIntents { + final int updateTargets, final ConversationIdSet conversationIdSet, + final int requestCode); + ++ /** ++ * Get a PendingIntent for marking a conversation as read. ++ * ++ *

This is intended to be used by notifications. ++ */ ++ public abstract PendingIntent getPendingIntentForMarkingAsRead(final Context context, ++ final ConversationIdSet conversationIdSet, final int requestCode); ++ + /** + * Get a PendingIntent for showing low storage notifications. + */ +diff --git a/src/com/android/messaging/ui/UIIntentsImpl.java b/src/com/android/messaging/ui/UIIntentsImpl.java +index d64082d..9281899 100644 +--- a/src/com/android/messaging/ui/UIIntentsImpl.java ++++ b/src/com/android/messaging/ui/UIIntentsImpl.java +@@ -430,6 +430,20 @@ public class UIIntentsImpl extends UIIntents { + PendingIntent.FLAG_UPDATE_CURRENT); + } + ++ @Override ++ public PendingIntent getPendingIntentForMarkingAsRead(final Context context, ++ final ConversationIdSet conversationIdSet, final int requestCode) { ++ final Intent intent = new Intent(context, NotificationReceiver.class); ++ intent.setAction(ACTION_MARK_AS_READ); ++ if (conversationIdSet != null) { ++ intent.putExtra(UI_INTENT_EXTRA_CONVERSATION_ID_SET, ++ conversationIdSet.getDelimitedString()); ++ } ++ return PendingIntent.getBroadcast(context, ++ requestCode, intent, ++ PendingIntent.FLAG_UPDATE_CURRENT); ++ } ++ + /** + * Gets a PendingIntent associated with an Intent to start an Activity. All notifications + * that starts an Activity must use this method to get a PendingIntent, which achieves two +-- +2.25.1 + diff --git a/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch b/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch new file mode 100644 index 0000000..b312add --- /dev/null +++ b/patches_platform/packages_apps_Trebuchet/0001-Trebuchet-Move-clear-all-button-to-actions-view.patch @@ -0,0 +1,142 @@ +From ff8f6e85177a0bab9c27785c3c0d9a59c4952e49 Mon Sep 17 00:00:00 2001 +From: Vachounet +Date: Mon, 26 Oct 2020 17:05:18 +0100 +Subject: [PATCH] Trebuchet: Move clear all button to actions view + +@AndyCGYan: Instead of removing the original, hide it in a simple way + +Change-Id: I7a0b2729c163169f7606ad4644870d07d5165e8e +--- + .../res/drawable/ic_recents_clear_all.xml | 18 ++++++++++++++++++ + .../res/layout/overview_actions_container.xml | 17 ++++++++++++++++- + .../quickstep/fallback/RecentsState.java | 2 +- + .../quickstep/views/LauncherRecentsView.java | 3 +-- + .../android/quickstep/views/RecentsView.java | 6 +++++- + 5 files changed, 41 insertions(+), 5 deletions(-) + create mode 100644 quickstep/res/drawable/ic_recents_clear_all.xml + +diff --git a/quickstep/res/drawable/ic_recents_clear_all.xml b/quickstep/res/drawable/ic_recents_clear_all.xml +new file mode 100644 +index 0000000000..2ad0bb824d +--- /dev/null ++++ b/quickstep/res/drawable/ic_recents_clear_all.xml +@@ -0,0 +1,18 @@ ++ ++ ++ ++ +diff --git a/quickstep/res/layout/overview_actions_container.xml b/quickstep/res/layout/overview_actions_container.xml +index 0fda0bf8d4..9a6f5ae062 100644 +--- a/quickstep/res/layout/overview_actions_container.xml ++++ b/quickstep/res/layout/overview_actions_container.xml +@@ -40,6 +40,21 @@ + android:text="@string/action_screenshot" + android:theme="@style/ThemeControlHighlightWorkspaceColor" /> + ++ ++ ++