diff --git a/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch b/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch deleted file mode 100644 index 2c5aeb1..0000000 --- a/patches_platform_personal/build_make/0001-build-Integrate-prop-modifications-1-2.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 45ce666776f48f82151a4fc3c8a3219f3e4c210f Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sun, 20 Jun 2021 09:08:43 +0000 -Subject: [PATCH 1/2] build: Integrate prop modifications (1/2) - -Change-Id: I24f54937e3e542b7c29ea86d24e3f523583a0c61 ---- - tools/buildinfo.sh | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh -index c00e1e98b..490d15215 100755 ---- a/tools/buildinfo.sh -+++ b/tools/buildinfo.sh -@@ -9,7 +9,7 @@ if [ "$BOARD_USE_VBMETA_DIGTEST_IN_FINGERPRINT" = "true" ] ; then - else - echo "ro.build.id=$BUILD_ID" - fi --echo "ro.build.display.id=$BUILD_DISPLAY_ID" -+echo "ro.build.display.id=$BUILD_ID" - echo "ro.build.version.incremental=$BUILD_NUMBER" - echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION" - echo "ro.build.version.preview_sdk=$PLATFORM_PREVIEW_SDK_VERSION" -@@ -23,7 +23,7 @@ echo "ro.build.version.release_or_preview_display=$PLATFORM_DISPLAY_VERSION" - echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH" - echo "ro.build.version.base_os=$PLATFORM_BASE_OS" - echo "ro.build.version.min_supported_target_sdk=$PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION" --echo "ro.build.date=`$DATE`" -+echo "ro.build.date=`$DATE +\"%B %-d, %Y\"`" - echo "ro.build.date.utc=`$DATE +%s`" - echo "ro.build.type=$TARGET_BUILD_TYPE" - echo "ro.build.user=$BUILD_USERNAME" -@@ -58,5 +58,10 @@ if [ -n "$BUILD_THUMBPRINT" ] ; then - fi - - echo "ro.lineage.device=$LINEAGE_DEVICE" -+echo "ro.lineage.version=LineageOS 20 Self-built CGMod" -+echo "ro.lineage.display.version=LineageOS 20 Self-built CGMod" -+echo "ro.modversion=LineageOS 20 Self-built CGMod" -+ -+echo "lockscreen.rot_override=true" - - echo "# end build properties" --- -2.25.1 - diff --git a/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch b/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch deleted file mode 100644 index f7ae26e..0000000 --- a/patches_platform_personal/build_make/0002-build-Remove-Stk-1-2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1c0c37fd29fb20537eca319cd5c3874127414d8a Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sat, 16 Oct 2021 00:39:15 +0000 -Subject: [PATCH 2/2] build: Remove Stk (1/2) - -Change-Id: I24ef17c74c3137a11b463cde96c74d0edc853edd ---- - target/product/generic_system.mk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk -index 1a639ef71..49a080076 100644 ---- a/target/product/generic_system.mk -+++ b/target/product/generic_system.mk -@@ -32,7 +32,6 @@ PRODUCT_PACKAGES += \ - PRODUCT_PACKAGES += \ - LiveWallpapersPicker \ - PartnerBookmarksProvider \ -- Stk \ - Tag \ - - # OTA support --- -2.25.1 - diff --git a/patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch b/patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch deleted file mode 100644 index 824556f..0000000 --- a/patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cf35535a94712e9f81d9532fa4a494a8628b4641 Mon Sep 17 00:00:00 2001 -From: Hikari-no-Tenshi -Date: Thu, 30 Jan 2020 22:20:54 +0200 -Subject: [PATCH 03/21] Disable Bluetooth by default - -Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c ---- - packages/SettingsProvider/res/values/defaults.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml -index 99b15db780dc..cff3e668f053 100644 ---- a/packages/SettingsProvider/res/values/defaults.xml -+++ b/packages/SettingsProvider/res/values/defaults.xml -@@ -36,7 +36,7 @@ - 100% - true - -- true -+ false - false - false - --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch b/patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch deleted file mode 100644 index c8ea5f8..0000000 --- a/patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8201fef9ab532374796549c938ea2fc172bf20f5 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Mon, 27 Sep 2021 16:30:00 +0000 -Subject: [PATCH 04/21] Disable cursor drag by default for editable TextViews - -Requested by @TadiT7 - -Change-Id: Id54e38ee418174af8cde4113c849bc292f5fc96d ---- - core/java/android/widget/WidgetFlags.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/java/android/widget/WidgetFlags.java b/core/java/android/widget/WidgetFlags.java -index fb40ee5ec843..c0c6fb6e9431 100644 ---- a/core/java/android/widget/WidgetFlags.java -+++ b/core/java/android/widget/WidgetFlags.java -@@ -38,7 +38,7 @@ public final class WidgetFlags { - /** - * Default value for the flag {@link #ENABLE_CURSOR_DRAG_FROM_ANYWHERE}. - */ -- public static final boolean ENABLE_CURSOR_DRAG_FROM_ANYWHERE_DEFAULT = true; -+ public static final boolean ENABLE_CURSOR_DRAG_FROM_ANYWHERE_DEFAULT = false; - - /** - * Threshold for the direction of a swipe gesture in order for it to be handled as a cursor drag --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch b/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch deleted file mode 100644 index 769ff2a..0000000 --- a/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0dba3680960846702881fed2b3e716825af92d58 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sun, 3 Jul 2022 00:08:42 +0000 -Subject: [PATCH 05/21] Disable "RESTRICTED bucket" toast - -Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8 ---- - .../server/usage/AppStandbyController.java | 20 +------------------ - 1 file changed, 1 insertion(+), 19 deletions(-) - -diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java -index b27ff411dd58..5ce49bd98c5c 100644 ---- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java -+++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java -@@ -1792,25 +1792,7 @@ public class AppStandbyController - .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason); - - if (isForcedByUser) { -- // Only user force can bypass the delay restriction. If the user forced the -- // app into the RESTRICTED bucket, then a toast confirming the action -- // shouldn't be surprising. -- // Exclude REASON_SUB_FORCED_USER_FLAG_INTERACTION since the RESTRICTED bucket -- // isn't directly visible in that flow. -- if (Build.IS_DEBUGGABLE -- && (reason & REASON_SUB_MASK) -- != REASON_SUB_FORCED_USER_FLAG_INTERACTION) { -- Toast.makeText(mContext, -- // Since AppStandbyController sits low in the lock hierarchy, -- // make sure not to call out with the lock held. -- mHandler.getLooper(), -- mContext.getResources().getString( -- R.string.as_app_forced_to_restricted_bucket, packageName), -- Toast.LENGTH_SHORT) -- .show(); -- } else { -- Slog.i(TAG, packageName + " restricted by user"); -- } -+ Slog.i(TAG, packageName + " restricted by user"); - } else { - final long timeUntilRestrictPossibleMs = app.lastUsedByUserElapsedTime - + mInjector.getAutoRestrictedBucketDelayMs() - elapsedRealtime; --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch deleted file mode 100644 index 070e5b9..0000000 --- a/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch +++ /dev/null @@ -1,169 +0,0 @@ -From c16a1a66b9e311a2dfbf1925d8f17783933571e5 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Thu, 2 Sep 2021 16:15:19 +0000 -Subject: [PATCH 06/21] Keyguard: Adjust clock style - -Thinner font, less padding and unintrusive colors - -Change-Id: I21e5d5bf37d724e75ebce4cd89349e0cc4dfc910 ---- - .../customization/res/layout/clock_default_large.xml | 1 + - .../customization/res/layout/clock_default_small.xml | 2 +- - packages/SystemUI/customization/res/values/colors.xml | 5 +++++ - .../android/systemui/shared/clocks/AnimatableClockView.kt | 2 +- - .../systemui/shared/clocks/DefaultClockController.kt | 4 ++-- - .../SystemUI/res-keyguard/layout/keyguard_slice_view.xml | 2 +- - packages/SystemUI/res-keyguard/values/dimens.xml | 6 +++--- - packages/SystemUI/res-keyguard/values/styles.xml | 2 -- - packages/SystemUI/res/layout/keyguard_status_bar.xml | 2 +- - packages/SystemUI/res/values/styles.xml | 4 ++-- - 10 files changed, 17 insertions(+), 13 deletions(-) - create mode 100644 packages/SystemUI/customization/res/values/colors.xml - -diff --git a/packages/SystemUI/customization/res/layout/clock_default_large.xml b/packages/SystemUI/customization/res/layout/clock_default_large.xml -index 0139d50dcfba..9f5ca7b89213 100644 ---- a/packages/SystemUI/customization/res/layout/clock_default_large.xml -+++ b/packages/SystemUI/customization/res/layout/clock_default_large.xml -@@ -26,6 +26,7 @@ - android:fontFamily="@*android:string/config_clockFontFamily" - android:typeface="monospace" - android:elegantTextHeight="false" -+ android:fontFeatureSettings="tnum" - chargeAnimationDelay="200" - dozeWeight="200" - lockScreenWeight="400" /> -diff --git a/packages/SystemUI/customization/res/layout/clock_default_small.xml b/packages/SystemUI/customization/res/layout/clock_default_small.xml -index ff6d7f9e2240..b63ffce20671 100644 ---- a/packages/SystemUI/customization/res/layout/clock_default_small.xml -+++ b/packages/SystemUI/customization/res/layout/clock_default_small.xml -@@ -27,7 +27,7 @@ - android:elegantTextHeight="false" - android:ellipsize="none" - android:singleLine="true" -- android:fontFeatureSettings="pnum" -+ android:fontFeatureSettings="tnum" - chargeAnimationDelay="350" - dozeWeight="200" - lockScreenWeight="400" /> -diff --git a/packages/SystemUI/customization/res/values/colors.xml b/packages/SystemUI/customization/res/values/colors.xml -new file mode 100644 -index 000000000000..f80af4376ff1 ---- /dev/null -+++ b/packages/SystemUI/customization/res/values/colors.xml -@@ -0,0 +1,5 @@ -+ -+ -+ @*android:color/primary_text_material_dark -+ @*android:color/primary_text_material_light -+ -diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt -index 86bd5f2bff5a..b99a8ba487cb 100644 ---- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt -+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt -@@ -146,7 +146,7 @@ class AnimatableClockView @JvmOverloads constructor( - fun refreshTime() { - time.timeInMillis = timeOverrideInMillis ?: System.currentTimeMillis() - contentDescription = DateFormat.format(descFormat, time) -- val formattedText = DateFormat.format(format, time) -+ val formattedText = DateFormat.format(format, time).toString() + ' ' - logBuffer?.log(TAG, DEBUG, - { str1 = formattedText?.toString() }, - { "refreshTime: new formattedText=$str1" } -diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt -index 4df7a44d3e1d..447160a8cb63 100644 ---- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt -+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt -@@ -143,9 +143,9 @@ class DefaultClockController( - if (seedColor != null) { - seedColor!! - } else if (isRegionDark) { -- resources.getColor(android.R.color.system_accent1_100) -+ resources.getColor(R.color.clock_default_color_dark) - } else { -- resources.getColor(android.R.color.system_accent2_600) -+ resources.getColor(R.color.clock_default_color_light) - } - - if (currentColor == color) { -diff --git a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml -index 7c5dbc247428..64657547621f 100644 ---- a/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml -+++ b/packages/SystemUI/res-keyguard/layout/keyguard_slice_view.xml -@@ -38,7 +38,7 @@ - android:id="@+id/row" - android:layout_width="match_parent" - android:layout_height="wrap_content" -- android:orientation="horizontal" -+ android:orientation="vertical" - android:gravity="start" - /> - -diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml -index edd6eff92c1c..14df77dc4a4e 100644 ---- a/packages/SystemUI/res-keyguard/values/dimens.xml -+++ b/packages/SystemUI/res-keyguard/values/dimens.xml -@@ -91,10 +91,10 @@ - 12dp - - -- 28dp -- 32dp -+ 22dp -+ 28dp - 16dp -- 28dp -+ 22dp - - - 32dp - -diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java -index 0745456b3e43..0fc0b9e29fb7 100644 ---- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java -+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardIndicationRotateTextViewController.java -@@ -224,12 +224,22 @@ public class KeyguardIndicationRotateTextViewController extends - } - - /** -- * @return true if there are available indications to show -+ * @return true if there are available non-resting indications to show. - */ - public boolean hasIndications() { -+ if (hasIndication(INDICATION_TYPE_PERSISTENT_UNLOCK_MESSAGE)) { -+ return mIndicationMessages.keySet().size() > 1; -+ } - return mIndicationMessages.keySet().size() > 0; - } - -+ /** -+ * @return true if there is an indication of the following type. -+ */ -+ public boolean hasIndication(@IndicationType int type) { -+ return mIndicationMessages.containsKey(type); -+ } -+ - /** - * Clears all messages in the queue and sets the current message to an empty string. - */ -diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java -index 2b3444e64acb..b8567d17785a 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java -@@ -407,7 +407,6 @@ public class KeyguardIndicationController { - updateLockScreenDisclosureMsg(); - updateLockScreenOwnerInfo(); - updateLockScreenBatteryMsg(animate); -- updateLockScreenUserLockedMsg(userId); - updateLockScreenTrustMsg(userId, getTrustGrantedIndication(), getTrustManagedIndication()); - updateLockScreenAlignmentMsg(); - updateLockScreenLogoutView(); -@@ -518,22 +517,6 @@ public class KeyguardIndicationController { - } - } - -- private void updateLockScreenUserLockedMsg(int userId) { -- if (!mKeyguardUpdateMonitor.isUserUnlocked(userId) -- || mKeyguardUpdateMonitor.isEncryptedOrLockdown(userId)) { -- mRotateTextViewController.updateIndication( -- INDICATION_TYPE_USER_LOCKED, -- new KeyguardIndication.Builder() -- .setMessage(mContext.getResources().getText( -- com.android.internal.R.string.lockscreen_storage_locked)) -- .setTextColor(mInitialTextColorState) -- .build(), -- false); -- } else { -- mRotateTextViewController.hideIndication(INDICATION_TYPE_USER_LOCKED); -- } -- } -- - private void updateBiometricMessage() { - if (mDozing) { - updateDeviceEntryIndication(false); -@@ -626,11 +609,11 @@ public class KeyguardIndicationController { - } - - private void updateLockScreenPersistentUnlockMsg() { -- if (!TextUtils.isEmpty(mPersistentUnlockMessage)) { -+ if (!mRotateTextViewController.hasIndications()) { - mRotateTextViewController.updateIndication( - INDICATION_TYPE_PERSISTENT_UNLOCK_MESSAGE, - new KeyguardIndication.Builder() -- .setMessage(mPersistentUnlockMessage) -+ .setMessage(mContext.getResources().getString(R.string.keyguard_unlock)) - .setTextColor(mInitialTextColorState) - .build(), - true); -diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java -index 9d30cb4c4852..f179194fb0e1 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextView.java -@@ -46,7 +46,7 @@ public class KeyguardIndicationTextView extends TextView { - @StyleRes - private static int sButtonStyleId = R.style.TextAppearance_Keyguard_BottomArea_Button; - -- private boolean mAnimationsEnabled = true; -+ private boolean mAnimationsEnabled = false; - private CharSequence mMessage; - private KeyguardIndication mKeyguardIndicationInfo; - --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch b/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch deleted file mode 100644 index 1188974..0000000 --- a/patches_platform_personal/frameworks_base/0010-Keyguard-UI-Fix-status-bar-quick-settings-margins-an.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 0425dac4b2f22dc37e117b55a0fdefe91f6e2ebb Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sat, 20 Mar 2021 10:35:14 +0000 -Subject: [PATCH 10/21] Keyguard/UI: Fix status bar / quick settings margins - and paddings - -Last revised on 2023/03/22, targeting T QPR2 - -The way I think SB/QS margins/paddings should work: -- Devices with left notch: [notch_definition][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding] -- Devices with center or no notch: [rounded_corner_content_padding][status_bar_padding_start][content]...[content][status_bar_padding_end][rounded_corner_content_padding] -Key point being: -- SB (including keyguard) and QS should always act uniformly -- Notch definition should only be the notch itself, without additional padding -- Instead, these paddings should be covered by status_bar_padding_{start|end} -As a result, below changes have been made: -- Change keyguard_carrier_text_margin into a padding and link to status_bar_padding_start -- Add status_bar_padding_{start|end} to quick settings header -- Remove unnecessary margins and paddings if any - -Change-Id: Ic91fa398813e1907297bb0892c444d96405950e7 ---- - packages/SystemUI/res/layout/combined_qs_header.xml | 2 +- - packages/SystemUI/res/layout/keyguard_status_bar.xml | 2 +- - packages/SystemUI/res/values-sw600dp/dimens.xml | 3 --- - packages/SystemUI/res/values/dimens.xml | 2 +- - packages/SystemUI/res/xml/qqs_header.xml | 4 ++-- - .../android/systemui/shade/ShadeHeaderController.kt | 10 +++++++--- - .../statusbar/phone/KeyguardStatusBarView.java | 7 ------- - 7 files changed, 12 insertions(+), 18 deletions(-) - -diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml -index 828a4535e656..65c8e52d00ac 100644 ---- a/packages/SystemUI/res/layout/combined_qs_header.xml -+++ b/packages/SystemUI/res/layout/combined_qs_header.xml -@@ -151,4 +151,4 @@ - - - -- -\ No newline at end of file -+ -diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml -index 9135e78f3e4c..ddaea938c858 100644 ---- a/packages/SystemUI/res/layout/keyguard_status_bar.xml -+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml -@@ -69,7 +69,7 @@ - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="@dimen/status_bar_padding_top" -- android:layout_marginStart="@dimen/keyguard_carrier_text_margin" -+ android:paddingStart="@dimen/keyguard_carrier_text_margin" - android:layout_toStartOf="@id/system_icons_container" - android:gravity="center_vertical" - android:ellipsize="marquee" -diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml -index 59becc69506c..9168a5ce1ced 100644 ---- a/packages/SystemUI/res/values-sw600dp/dimens.xml -+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml -@@ -28,9 +28,6 @@ - - 30dp - -- -- 24dp -- - - 400dp - -diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml -index e2c65f5542b7..d0a9055e1905 100644 ---- a/packages/SystemUI/res/values/dimens.xml -+++ b/packages/SystemUI/res/values/dimens.xml -@@ -790,7 +790,7 @@ - 32dp - - -- 16dp -+ @dimen/status_bar_padding_start - - -diff --git a/packages/SystemUI/res/xml/qqs_header.xml b/packages/SystemUI/res/xml/qqs_header.xml -index 00a0444a1c9d..a5c3f8e982ca 100644 ---- a/packages/SystemUI/res/xml/qqs_header.xml -+++ b/packages/SystemUI/res/xml/qqs_header.xml -@@ -44,7 +44,7 @@ - - -- -\ No newline at end of file -+ -diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt -index a6b88370f836..e7632971d37e 100644 ---- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt -+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt -@@ -132,6 +132,8 @@ constructor( - - private var roundedCorners = 0 - private var cutout: DisplayCutout? = null -+ private var statusBarPaddingStart = 0 -+ private var statusBarPaddingEnd = 0 - private var lastInsets: WindowInsets? = null - private var textColorPrimary = Color.TRANSPARENT - -@@ -364,14 +366,17 @@ constructor( - val cutoutLeft = sbInsets.first - val cutoutRight = sbInsets.second - val hasCornerCutout: Boolean = insetsProvider.currentRotationHasCornerCutout() -+ roundedCorners = resources.getDimensionPixelSize(R.dimen.rounded_corner_content_padding) -+ statusBarPaddingStart = resources.getDimensionPixelSize(R.dimen.status_bar_padding_start) -+ statusBarPaddingEnd = resources.getDimensionPixelSize(R.dimen.status_bar_padding_end) - updateQQSPaddings() - // Set these guides as the left/right limits for content that lives in the top row, using - // cutoutLeft and cutoutRight - var changes = - combinedShadeHeadersConstraintManager.edgesGuidelinesConstraints( -- if (view.isLayoutRtl) cutoutRight else cutoutLeft, -+ (if (view.isLayoutRtl) cutoutRight else cutoutLeft) + statusBarPaddingStart, - header.paddingStart, -- if (view.isLayoutRtl) cutoutLeft else cutoutRight, -+ (if (view.isLayoutRtl) cutoutLeft else cutoutRight) + statusBarPaddingEnd, - header.paddingEnd - ) - -@@ -483,7 +488,6 @@ constructor( - } - - private fun updateResources() { -- roundedCorners = resources.getDimensionPixelSize(R.dimen.rounded_corner_content_padding) - val padding = resources.getDimensionPixelSize(R.dimen.qs_panel_padding) - header.setPadding(padding, header.paddingTop, padding, header.paddingBottom) - updateQQSPaddings() -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 7b6fc66a208d..ab919f4c5882 100644 ---- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java -@@ -164,14 +164,7 @@ public class KeyguardStatusBarView extends RelativeLayout { - mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, - getResources().getDimensionPixelSize( - com.android.internal.R.dimen.text_size_small_material)); -- lp = (MarginLayoutParams) mCarrierLabel.getLayoutParams(); - -- int marginStart = calculateMargin( -- getResources().getDimensionPixelSize(R.dimen.keyguard_carrier_text_margin), -- mPadding.first); -- lp.setMarginStart(marginStart); -- -- mCarrierLabel.setLayoutParams(lp); - updateKeyguardStatusBarHeight(); - } - --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch b/patches_platform_personal/frameworks_base/0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch deleted file mode 100644 index 81495f0..0000000 --- a/patches_platform_personal/frameworks_base/0011-Revert-SystemUI-Add-left-padding-for-keyguard-slices.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4803ddab6f362587e769b2aa5d60a041345d26af Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Tue, 31 May 2022 00:00:08 +0000 -Subject: [PATCH 11/21] Revert "SystemUI: Add left padding for keyguard slices" - -This reverts commit 4a7a4426944e28e70a3eca6a696ff6c7599fb896. ---- - .../src/com/android/keyguard/KeyguardSliceView.java | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java -index 31d22eb38a24..65a71664e245 100644 ---- a/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java -+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java -@@ -49,7 +49,6 @@ import com.android.internal.graphics.ColorUtils; - import com.android.settingslib.Utils; - import com.android.systemui.R; - import com.android.systemui.animation.Interpolators; --import com.android.systemui.keyguard.KeyguardSliceProvider; - import com.android.systemui.util.wakelock.KeepAwakeAnimationListener; - - import java.io.PrintWriter; -@@ -446,15 +445,13 @@ public class KeyguardSliceView extends LinearLayout { - - private void updatePadding() { - boolean hasText = !TextUtils.isEmpty(getText()); -- boolean isDate = Uri.parse(KeyguardSliceProvider.KEYGUARD_DATE_URI).equals(getTag()); - int padding = (int) getContext().getResources() - .getDimension(R.dimen.widget_horizontal_padding) / 2; -- int iconPadding = (int) mContext.getResources() -- .getDimension(R.dimen.widget_icon_padding); - // orientation is vertical, so add padding to top & bottom -- setPadding(!isDate ? iconPadding : 0, padding, 0, hasText ? padding : 0); -+ setPadding(0, padding, 0, hasText ? padding : 0); - -- setCompoundDrawablePadding(iconPadding); -+ setCompoundDrawablePadding((int) mContext.getResources() -+ .getDimension(R.dimen.widget_icon_padding)); - } - - @Override --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0012-Revert-Update-RAT-icons-to-match-Silk-design.patch b/patches_platform_personal/frameworks_base/0012-Revert-Update-RAT-icons-to-match-Silk-design.patch deleted file mode 100644 index aa87417..0000000 --- a/patches_platform_personal/frameworks_base/0012-Revert-Update-RAT-icons-to-match-Silk-design.patch +++ /dev/null @@ -1,273 +0,0 @@ -From f5ad15c1785d0a458bc2be47f0ef2a8d5283ae86 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sun, 5 Sep 2021 01:20:12 +0000 -Subject: [PATCH 12/21] Revert "Update RAT icons to match Silk design" - -This reverts commit 084c13c8216f6a899cd3eda04fc1d7acff3d1248. ---- - .../res/drawable/ic_3g_mobiledata.xml | 19 ++++++----- - .../res/drawable/ic_4g_mobiledata.xml | 19 ++++++----- - .../res/drawable/ic_5g_mobiledata.xml | 20 +++++------ - .../res/drawable/ic_5g_uc_mobiledata.xml | 33 ------------------- - .../res/drawable/ic_5g_uw_mobiledata.xml | 33 ------------------- - .../res/drawable/ic_carrier_wifi.xml | 15 +++++---- - .../res/drawable/ic_lte_mobiledata.xml | 23 +++++++------ - .../res/drawable/stat_sys_roaming_large.xml | 10 +++--- - 8 files changed, 59 insertions(+), 113 deletions(-) - delete mode 100644 packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml - delete mode 100644 packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml - -diff --git a/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml -index 413a3873f438..0c942bdf993c 100644 ---- a/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml -+++ b/packages/SettingsLib/res/drawable/ic_3g_mobiledata.xml -@@ -14,14 +14,17 @@ - limitations under the License. - --> - -+ android:width="12.35dp" -+ android:height="15dp" -+ android:viewportWidth="14" -+ android:viewportHeight="17"> -+ -+ - -+ android:fillColor="#FFFFFFFF" -+ android:pathData="M13.77,12.24l-0.22,0.27c-0.63,0.73-1.55,1.1-2.76,1.1c-1.08,0-1.92-0.36-2.53-1.07c-0.61-0.71-0.93-1.72-0.94-3.02V7.56 c0-1.39,0.28-2.44,0.84-3.13s1.39-1.04,2.51-1.04c0.95,0,1.69,0.26,2.23,0.79s0.83,1.28,0.89,2.26h-1.25 C12.47,5.82,12.3,5.33,12,4.98s-0.74-0.52-1.34-0.52c-0.72,0-1.24,0.23-1.57,0.7S8.59,6.37,8.58,7.4v2.03c0,1,0.19,1.77,0.57,2.31 c0.38,0.54,0.93,0.8,1.65,0.8c0.67,0,1.19-0.16,1.54-0.49l0.18-0.17V9.59H10.7V8.52h3.07V12.24z" /> - -+ android:pathData="M 0 0 H 14 V 17 H 0 V 0 Z" /> - -diff --git a/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml -index 1de7d78ff5f2..535f3589ea6b 100644 ---- a/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml -+++ b/packages/SettingsLib/res/drawable/ic_4g_mobiledata.xml -@@ -14,14 +14,17 @@ - limitations under the License. - --> - -+ android:width="12.35dp" -+ android:height="15dp" -+ android:viewportWidth="14" -+ android:viewportHeight="17"> -+ -+ - -+ android:fillColor="#FFFFFFFF" -+ android:pathData="M13.9,12.24l-0.22,0.27c-0.63,0.73-1.55,1.1-2.76,1.1c-1.08,0-1.92-0.36-2.53-1.07c-0.61-0.71-0.93-1.72-0.94-3.02V7.56 c0-1.39,0.28-2.44,0.84-3.13s1.39-1.04,2.51-1.04c0.95,0,1.69,0.26,2.23,0.79s0.83,1.28,0.89,2.26h-1.25 c-0.05-0.62-0.22-1.1-0.52-1.45s-0.74-0.52-1.34-0.52c-0.72,0-1.24,0.23-1.57,0.7S8.72,6.37,8.71,7.4v2.03 c0,1,0.19,1.77,0.57,2.31c0.38,0.54,0.93,0.8,1.65,0.8c0.67,0,1.19-0.16,1.54-0.49l0.18-0.17V9.59h-1.82V8.52h3.07V12.24z" /> - -+ android:pathData="M 0 0 H 14 V 17 H 0 V 0 Z" /> - -diff --git a/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml -index d961c6c2266f..2aa6e57f6f82 100644 ---- a/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml -+++ b/packages/SettingsLib/res/drawable/ic_5g_mobiledata.xml -@@ -14,14 +14,14 @@ - limitations under the License. - --> - -- -- -+ android:width="14dp" -+ android:height="17dp" -+ android:viewportWidth="14" -+ android:viewportHeight="17"> -+ -+ - -diff --git a/packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml -deleted file mode 100644 -index 93fcad298c3f..000000000000 ---- a/packages/SettingsLib/res/drawable/ic_5g_uc_mobiledata.xml -+++ /dev/null -@@ -1,33 +0,0 @@ -- -- -- -- -- -- -- -diff --git a/packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml -deleted file mode 100644 -index ca47b6ff2edb..000000000000 ---- a/packages/SettingsLib/res/drawable/ic_5g_uw_mobiledata.xml -+++ /dev/null -@@ -1,33 +0,0 @@ -- -- -- -- -- -- -- -diff --git a/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml b/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml -index 22bcf7b8c8a3..ed9d85e3cbe4 100644 ---- a/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml -+++ b/packages/SettingsLib/res/drawable/ic_carrier_wifi.xml -@@ -14,14 +14,17 @@ - limitations under the License. - --> - -+ android:width="38dp" -+ android:height="24dp" -+ android:viewportWidth="38.0" -+ android:viewportHeight="24.0"> - -+ android:pathData="M9.45,14.48h1.8c-0.05,0.98 -0.24,1.82 -0.6,2.53c-0.35,0.7 -0.85,1.24 -1.51,1.62c-0.66,0.38 -1.48,0.57 -2.47,0.57c-0.71,0 -1.35,-0.14 -1.92,-0.42c-0.57,-0.28 -1.06,-0.68 -1.47,-1.2c-0.4,-0.53 -0.71,-1.16 -0.93,-1.89c-0.21,-0.74 -0.32,-1.56 -0.32,-2.48v-2.63c0,-0.91 0.11,-1.74 0.32,-2.47c0.22,-0.74 0.54,-1.36 0.95,-1.88C3.71,5.69 4.21,5.29 4.8,5.01c0.6,-0.28 1.28,-0.42 2.03,-0.42c0.92,0 1.71,0.19 2.34,0.56c0.64,0.36 1.14,0.9 1.48,1.61c0.35,0.7 0.55,1.57 0.59,2.59h-1.8C9.41,8.59 9.29,7.98 9.1,7.52C8.91,7.04 8.63,6.69 8.26,6.47C7.9,6.24 7.42,6.13 6.84,6.13c-0.52,0 -0.97,0.1 -1.36,0.31C5.1,6.65 4.79,6.95 4.54,7.34C4.3,7.72 4.12,8.19 3.99,8.74c-0.12,0.54 -0.18,1.15 -0.18,1.82v2.65c0,0.62 0.05,1.21 0.15,1.75c0.1,0.54 0.27,1.02 0.49,1.43c0.23,0.4 0.52,0.72 0.89,0.95c0.36,0.23 0.81,0.34 1.33,0.34c0.66,0 1.18,-0.11 1.56,-0.32c0.38,-0.21 0.67,-0.56 0.85,-1.03C9.27,15.85 9.39,15.23 9.45,14.48z"/> - -+ android:pathData="M24.87,4.78l-1.74,9.72l-0.2,1.64l-0.29,-1.44l-2.21,-9.92l-0.2,0l-1.06,0l-0.22,0l-2.28,9.92l-0.28,1.4l-0.18,-1.59l-1.78,-9.73l-1.79,0l2.83,14.22l0.34,0l0.92,0l0.35,0l2.48,-10.36l0.14,-0.84l0.15,0.84l2.36,10.36l0.36,0l0.92,0l0.34,0l2.82,-14.22z"/> -+ - -diff --git a/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml b/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml -index 739e29d886c2..e6b4fb698242 100644 ---- a/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml -+++ b/packages/SettingsLib/res/drawable/ic_lte_mobiledata.xml -@@ -14,17 +14,20 @@ - limitations under the License. - --> - -+ android:width="15.88dp" -+ android:height="15dp" -+ android:viewportWidth="18" -+ android:viewportHeight="17"> -+ -+ - -+ android:fillColor="#FFFFFFFF" -+ android:pathData="M11.1,4.6H8.48v8.88H7.23V4.6H4.62V3.52h6.48V4.6z" /> - -+ android:fillColor="#FFFFFFFF" -+ android:pathData="M17.34,8.88h-3.52v3.53h4.1v1.07h-5.35V3.52h5.28V4.6h-4.03V7.8h3.52V8.88z" /> - -+ android:pathData="M 0 0 H 18 V 17 H 0 V 0 Z" /> - -diff --git a/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml b/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml -index 48faeb22416f..1511659ea42f 100644 ---- a/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml -+++ b/packages/SystemUI/res/drawable/stat_sys_roaming_large.xml -@@ -14,11 +14,11 @@ - limitations under the License. - --> - -+ android:width="@dimen/signal_icon_size" -+ android:height="@dimen/signal_icon_size" -+ android:viewportWidth="24.0" -+ android:viewportHeight="24.0"> - -+ android:pathData="M14.21,12.81c0.36,-0.16 0.69,-0.36 0.97,-0.61c0.41,-0.38 0.72,-0.83 0.94,-1.37c0.21,-0.54 0.32,-1.14 0.32,-1.79c0,-0.92 -0.16,-1.7 -0.49,-2.33c-0.32,-0.64 -0.79,-1.12 -1.43,-1.45c-0.62,-0.33 -1.4,-0.49 -2.32,-0.49H8.23V19h1.8v-5.76h2.5L15.06,19h1.92v-0.12L14.21,12.81zM10.03,11.71V6.32h2.18c0.59,0 1.06,0.11 1.42,0.34c0.36,0.22 0.62,0.54 0.78,0.95c0.16,0.41 0.24,0.89 0.24,1.44c0,0.49 -0.09,0.93 -0.27,1.34c-0.18,0.4 -0.46,0.73 -0.82,0.97c-0.36,0.23 -0.82,0.35 -1.37,0.35H10.03z"/> - --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch b/patches_platform_personal/frameworks_base/0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch deleted file mode 100644 index 465468b..0000000 --- a/patches_platform_personal/frameworks_base/0013-Revert-Use-the-default-top-clock-margin-on-h800-devi.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 15e59be158a3305a17e14cc18883d323d2afc54b Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Thu, 29 Sep 2022 11:27:57 +0000 -Subject: [PATCH 13/21] Revert "Use the default top clock margin on h800 - devices" - -This reverts commits 50ba380f4d8d1c2523e0f76295ca556038796bfd -and 2a254b4d479029aec46f79a0ed14ffab6d0424bc. ---- - packages/SystemUI/res/values-h800dp/dimens.xml | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/packages/SystemUI/res/values-h800dp/dimens.xml b/packages/SystemUI/res/values-h800dp/dimens.xml -index 3a71994e07e2..4b9bce0eda99 100644 ---- a/packages/SystemUI/res/values-h800dp/dimens.xml -+++ b/packages/SystemUI/res/values-h800dp/dimens.xml -@@ -15,6 +15,9 @@ - --> - - -+ -+ 38dp -+ - - -112dp - --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0014-UI-Always-render-windows-into-cutouts.patch b/patches_platform_personal/frameworks_base/0014-UI-Always-render-windows-into-cutouts.patch deleted file mode 100644 index c73d572..0000000 --- a/patches_platform_personal/frameworks_base/0014-UI-Always-render-windows-into-cutouts.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6927e68fa4ec001ec72e9f68e4454a37c8bc7bb5 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Wed, 7 Oct 2020 14:00:35 +0000 -Subject: [PATCH 14/21] UI: Always render windows into cutouts - -Eliminates black/white letterboxing -Quick and dirty way to do the latter - wait for proper fix from Google - -Change-Id: I4661c7979bfa7de453329fcddbaeefc2009e2da3 ---- - .../com/android/server/wm/DisplayFrames.java | 28 +++---------------- - .../com/android/server/wm/DisplayPolicy.java | 1 + - 2 files changed, 5 insertions(+), 24 deletions(-) - -diff --git a/services/core/java/com/android/server/wm/DisplayFrames.java b/services/core/java/com/android/server/wm/DisplayFrames.java -index 33641f72b2ff..6e201970ac03 100644 ---- a/services/core/java/com/android/server/wm/DisplayFrames.java -+++ b/services/core/java/com/android/server/wm/DisplayFrames.java -@@ -92,30 +92,10 @@ public class DisplayFrames { - state.setRoundedCorners(roundedCorners); - state.setPrivacyIndicatorBounds(indicatorBounds); - state.getDisplayCutoutSafe(safe); -- if (safe.left > unrestricted.left) { -- state.getSource(ITYPE_LEFT_DISPLAY_CUTOUT).setFrame( -- unrestricted.left, unrestricted.top, safe.left, unrestricted.bottom); -- } else { -- state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT); -- } -- if (safe.top > unrestricted.top) { -- state.getSource(ITYPE_TOP_DISPLAY_CUTOUT).setFrame( -- unrestricted.left, unrestricted.top, unrestricted.right, safe.top); -- } else { -- state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT); -- } -- if (safe.right < unrestricted.right) { -- state.getSource(ITYPE_RIGHT_DISPLAY_CUTOUT).setFrame( -- safe.right, unrestricted.top, unrestricted.right, unrestricted.bottom); -- } else { -- state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT); -- } -- if (safe.bottom < unrestricted.bottom) { -- state.getSource(ITYPE_BOTTOM_DISPLAY_CUTOUT).setFrame( -- unrestricted.left, safe.bottom, unrestricted.right, unrestricted.bottom); -- } else { -- state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT); -- } -+ state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT); -+ state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT); -+ state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT); -+ state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT); - return true; - } - -diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java -index 1468360b37b7..a1f70e4c8deb 100644 ---- a/services/core/java/com/android/server/wm/DisplayPolicy.java -+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java -@@ -1558,6 +1558,7 @@ public class DisplayPolicy { - displayFrames = win.getDisplayFrames(displayFrames); - - final WindowManager.LayoutParams attrs = win.mAttrs.forRotation(displayFrames.mRotation); -+ attrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS; - sTmpClientFrames.attachedFrame = attached != null ? attached.getFrame() : null; - - // If this window has different LayoutParams for rotations, we cannot trust its requested --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch b/patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch deleted file mode 100644 index a3e9492..0000000 --- a/patches_platform_personal/frameworks_base/0015-UI-Kill-rounded-corners-in-notification-scrim.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 89c565bf1a9ce56a64191059424bf9f5fe04f1d9 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Wed, 1 Sep 2021 14:10:50 +0000 -Subject: [PATCH 15/21] UI: Kill rounded corners in notification scrim - -Rounded corners in S is nicely implemented, but this is one occasion where it looks out of place - -Change-Id: I09ed59e0e658ebd512a9d02a8ef3edfe2c9888da ---- - packages/SystemUI/res/values/dimens.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml -index d0a9055e1905..30881992795d 100644 ---- a/packages/SystemUI/res/values/dimens.xml -+++ b/packages/SystemUI/res/values/dimens.xml -@@ -726,7 +726,7 @@ - - -60dp - -- 32dp -+ 0dp - - - 110dp --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch b/patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch deleted file mode 100644 index e5bbc27..0000000 --- a/patches_platform_personal/frameworks_base/0016-UI-Reconfigure-power-menu-items.patch +++ /dev/null @@ -1,32 +0,0 @@ -From be2477f3314d044e1d7581905a4d358aa0f0a2a7 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Mon, 26 Oct 2020 14:06:56 +0000 -Subject: [PATCH 16/21] UI: Reconfigure power menu items - -Change-Id: I32cca6e2c6bb64d891efee959127edf7c0802cbc ---- - core/res/res/values/config.xml | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 87e3ddcf8fdf..64d592b2230b 100644 ---- a/core/res/res/values/config.xml -+++ b/core/res/res/values/config.xml -@@ -3305,13 +3305,10 @@ - "logout" = Logout the current user - --> - -- emergency -- lockdown - power - restart -- logout - screenshot -- bugreport -+ airplane - - - - -- internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle -+ wifi,cell,hotspot,location,rotation,flashlight - - - --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch b/patches_platform_personal/frameworks_base/0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch deleted file mode 100644 index 3485233..0000000 --- a/patches_platform_personal/frameworks_base/0018-UI-Relax-requirement-for-HINT_SUPPORTS_DARK_TEXT.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fe8362152cdb0a17376ffedb37030cc57d14b375 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Tue, 29 Jun 2021 22:57:01 +0000 -Subject: [PATCH 18/21] UI: Relax requirement for HINT_SUPPORTS_DARK_TEXT - -I decide what's good enough for a wallpaper! - -Change-Id: I5ccd85b3df12e53746a4ac6cbc37ba8d11f6c336 ---- - core/java/android/app/WallpaperColors.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java -index a34a50c4b7b0..028f77fb21b0 100644 ---- a/core/java/android/app/WallpaperColors.java -+++ b/core/java/android/app/WallpaperColors.java -@@ -580,7 +580,7 @@ public final class WallpaperColors implements Parcelable { - - int hints = 0; - double meanLuminance = totalLuminance / pixels.length; -- if (meanLuminance > BRIGHT_IMAGE_MEAN_LUMINANCE && darkPixels < maxDarkPixels) { -+ if (meanLuminance > BRIGHT_IMAGE_MEAN_LUMINANCE) { - hints |= HINT_SUPPORTS_DARK_TEXT; - } - if (meanLuminance < DARK_THEME_MEAN_LUMINANCE) { --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot.patch b/patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot.patch deleted file mode 100644 index 0a2158c..0000000 --- a/patches_platform_personal/frameworks_base/0019-UI-Remove-privacy-dot.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a0cd4caf1cd92218e44db206ec2f67839ce4dbe8 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Tue, 19 Oct 2021 12:09:34 +0000 -Subject: [PATCH 19/21] UI: Remove privacy dot - -Change-Id: I5d2e2b3e36f027b4348a83030d4b4d3c4f0209d1 ---- - packages/SystemUI/res/values/dimens.xml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml -index 30881992795d..7ead38868815 100644 ---- a/packages/SystemUI/res/values/dimens.xml -+++ b/packages/SystemUI/res/values/dimens.xml -@@ -1059,12 +1059,12 @@ - 56dp - - 76dp -- 6dp -+ 0dp - 10dp - 15dp - 7dp - -- 20dp -+ 0dp - - @dimen/notification_shade_content_margin_horizontal - --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0020-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch b/patches_platform_personal/frameworks_base/0020-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch deleted file mode 100644 index 63af257..0000000 --- a/patches_platform_personal/frameworks_base/0020-UI-Restore-quick-settings-fonts-to-pre-T-QPR2.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7cacf0df0092432cd2347e0cbae0c1c3d0f5dcf9 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Wed, 22 Mar 2023 00:29:13 +0000 -Subject: [PATCH 20/21] UI: Restore quick settings fonts to pre-T-QPR2 - -TODO: Large header clock looks better in Regular - perhaps figure out how to transition smoothly? -Change-Id: If2e57fee61b6bd4b6b7fedc7e3011164cd2cb56f ---- - packages/SystemUI/res/values/styles.xml | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml -index 6996e41e08da..5e6d45ac9305 100644 ---- a/packages/SystemUI/res/values/styles.xml -+++ b/packages/SystemUI/res/values/styles.xml -@@ -134,7 +134,7 @@ - - - - - - --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch b/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch deleted file mode 100644 index 90ee5e4..0000000 --- a/patches_platform_personal/frameworks_base/0021-UI-Revert-to-HSL-luminance-for-wallpaper-dark-hints.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9732bf6c88d489f587e62d9f6b382e876295cbd6 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Fri, 30 Sep 2022 16:02:16 +0000 -Subject: [PATCH 21/21] UI: Revert to HSL luminance for wallpaper dark hints - -Y U no test for consistency, Google? - -Change-Id: Ie5663bdf518b4ef93d6deb634e707a32d052ac55 ---- - core/java/android/app/WallpaperColors.java | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/core/java/android/app/WallpaperColors.java b/core/java/android/app/WallpaperColors.java -index 028f77fb21b0..63ccf961a2d8 100644 ---- a/core/java/android/app/WallpaperColors.java -+++ b/core/java/android/app/WallpaperColors.java -@@ -555,15 +555,15 @@ public final class WallpaperColors implements Parcelable { - float[] tmpHsl = new float[3]; - for (int i = 0; i < pixels.length; i++) { - int pixelColor = pixels[i]; -- ColorUtils.colorToHSL(pixelColor, tmpHsl); - final int alpha = Color.alpha(pixelColor); - - // Apply composite colors where the foreground is a black layer with an alpha value of - // the dim amount and the background is the wallpaper pixel color. - int compositeColors = ColorUtils.compositeColors(blackTransparent, pixelColor); - -- // Calculate the adjusted luminance of the dimmed wallpaper pixel color. -- double adjustedLuminance = ColorUtils.calculateLuminance(compositeColors); -+ // Calculate the luminance of the dimmed wallpaper pixel color. -+ ColorUtils.colorToHSL(compositeColors, tmpHsl); -+ double luminance = tmpHsl[2]; - - // Make sure we don't have a dark pixel mass that will - // make text illegible. -@@ -575,7 +575,7 @@ public final class WallpaperColors implements Parcelable { - pixels[i] = Color.RED; - } - } -- totalLuminance += adjustedLuminance; -+ totalLuminance += luminance; - } - - int hints = 0; --- -2.34.1 - diff --git a/patches_platform_personal/frameworks_opt_telephony/0001-Telephony-Disable-SPN-retrieval.patch b/patches_platform_personal/frameworks_opt_telephony/0001-Telephony-Disable-SPN-retrieval.patch deleted file mode 100644 index fbe4acb..0000000 --- a/patches_platform_personal/frameworks_opt_telephony/0001-Telephony-Disable-SPN-retrieval.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f6baebedc09b503e477f7f4f1d83ac494d5028d3 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Tue, 8 Jun 2021 12:00:26 +0000 -Subject: [PATCH] Telephony: Disable SPN retrieval - -Kills "double carrier name" on lock screen -Not ideal, but not worth wasting more time on - -Change-Id: I06dd17989194590972e526de85dbacf74eff805e ---- - .../internal/telephony/uicc/IccRecords.java | 25 +++++-------------- - 1 file changed, 6 insertions(+), 19 deletions(-) - -diff --git a/src/java/com/android/internal/telephony/uicc/IccRecords.java b/src/java/com/android/internal/telephony/uicc/IccRecords.java -index b33e899b9..220ed875d 100644 ---- a/src/java/com/android/internal/telephony/uicc/IccRecords.java -+++ b/src/java/com/android/internal/telephony/uicc/IccRecords.java -@@ -717,35 +717,22 @@ public abstract class IccRecords extends Handler implements IccConstants { - } - - /** -- * Return Service Provider Name stored in SIM (EF_SPN=0x6F46) or in RUIM (EF_RUIM_SPN=0x6F41). -+ * Return null, disabling Service Provider Name. - * -- * @return null if SIM is not yet ready or no RUIM entry -+ * @return null - */ - public String getServiceProviderName() { -- if (mCarrierTestOverride.isInTestMode()) { -- String fakeSpn = mCarrierTestOverride.getFakeSpn(); -- if (fakeSpn != null) { -- return fakeSpn; -- } -- } -- return mSpn; -+ return null; - } - - /** -- * Return Service Provider Name stored in SIM (EF_SPN=0x6F46) or in RUIM (EF_RUIM_SPN=0x6F41) or -- * the brand override. The brand override has higher priority than the SPN from SIM. -+ * Return null, disabling Service Provider Name. - * -- * @return service provider name. -+ * @return null - */ - @Nullable - public String getServiceProviderNameWithBrandOverride() { -- if (mParentApp != null && mParentApp.getUiccProfile() != null) { -- String brandOverride = mParentApp.getUiccProfile().getOperatorBrandOverride(); -- if (!TextUtils.isEmpty(brandOverride)) { -- return brandOverride; -- } -- } -- return mSpn; -+ return null; - } - - protected void setServiceProviderName(String spn) { --- -2.25.1 - diff --git a/patches_platform_personal/lineage-sdk/0001-sdk-Do-not-warn-about-SELinux-and-build-signature-st.patch b/patches_platform_personal/lineage-sdk/0001-sdk-Do-not-warn-about-SELinux-and-build-signature-st.patch deleted file mode 100644 index 6430e12..0000000 --- a/patches_platform_personal/lineage-sdk/0001-sdk-Do-not-warn-about-SELinux-and-build-signature-st.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8a3d38d3148713836c12d85f7fc4a6a366cc00e4 Mon Sep 17 00:00:00 2001 -From: AndyCGYan -Date: Mon, 4 Mar 2019 14:27:56 +0800 -Subject: [PATCH] sdk: Do not warn about SELinux and build signature status - -Change-Id: I6e1ca9f2c2f7763364a9a370f444dfe8059d0563 ---- - .../org/lineageos/platform/internal/TrustInterfaceService.java | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java -index 2dcb938..e9f2dca 100644 ---- a/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java -+++ b/lineage/lib/main/java/org/lineageos/platform/internal/TrustInterfaceService.java -@@ -197,15 +197,6 @@ public class TrustInterfaceService extends LineageSystemService { - } - - private void runTestInternal() { -- int selinuxStatus = getSELinuxStatus(); -- if (selinuxStatus != TrustInterface.TRUST_FEATURE_LEVEL_GOOD) { -- postNotificationForFeatureInternal(TrustInterface.TRUST_WARN_SELINUX); -- } -- -- int keysStatus = getKeysStatus(); -- if (keysStatus != TrustInterface.TRUST_FEATURE_LEVEL_GOOD) { -- postNotificationForFeatureInternal(TrustInterface.TRUST_WARN_PUBLIC_KEY); -- } - } - - /* Utils */ --- -2.7.4 - diff --git a/patches_platform_personal/packages_apps_DeskClock/0001-Squashed-revert-of-LOS-widget-redesign.patch b/patches_platform_personal/packages_apps_DeskClock/0001-Squashed-revert-of-LOS-widget-redesign.patch deleted file mode 100644 index 28c98cb..0000000 --- a/patches_platform_personal/packages_apps_DeskClock/0001-Squashed-revert-of-LOS-widget-redesign.patch +++ /dev/null @@ -1,3049 +0,0 @@ -From 84f4aefde14a8c3948fee25fafd655e6d93bdb26 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Thu, 8 Jun 2023 00:46:00 +0800 -Subject: [PATCH 1/4] Squashed revert of LOS widget redesign - -Until it no longer works... - -- Revert "DeskClock: Another round of cleanups" -- Revert "DeskClock: Digital widget: Redesign" -- Revert "DeskClock: update digital widget" ---- - AndroidManifest.xml | 11 +- - .../appwidget_digital_clock_preview.png | Bin 0 -> 10832 bytes - res/drawable/ic_checkmark.xml | 27 +++ - res/drawable/widget_background.xml | 11 -- - .../widget_configuration_background.xml | 14 -- - res/layout-night/digital_widget_preview.xml | 59 ------- - res/layout/alarm_time_collapsed.xml | 2 +- - res/layout/day_button.xml | 30 ++++ - res/layout/digital_widget.xml | 52 ++---- - res/layout/digital_widget_configuration.xml | 132 --------------- - .../digital_widget_configuration_preview.xml | 60 ------- - ...idget_configuration_preview_solid_root.xml | 17 -- - ...configuration_preview_transparent_root.xml | 17 -- - ...digital_widget_darkbg_solid_theme_root.xml | 14 -- - .../digital_widget_darkbg_theme_root.xml | 14 -- - ...igital_widget_lightbg_solid_theme_root.xml | 14 -- - .../digital_widget_lightbg_theme_root.xml | 14 -- - res/layout/digital_widget_preview.xml | 60 ------- - res/layout/digital_widget_sizer.xml | 34 ++-- - res/layout/world_clock_remote_list_item.xml | 45 +++-- - res/values-h560dp/dimens.xml | 2 +- - res/values-h650dp/dimens.xml | 2 +- - res/values-land/dimens.xml | 1 + - res/values-land/fractions.xml | 6 + - res/values-night/styles.xml | 15 -- - res/values-sw600dp-land/dimens.xml | 3 +- - res/values-sw600dp/dimens.xml | 15 +- - res/values-sw720dp/dimens.xml | 2 +- - res/values-w360dp-h420dp/bools.xml | 19 +++ - res/values-w470dp-land/bools.xml | 20 +++ - res/values/attrs.xml | 13 -- - res/values/bools.xml | 2 + - res/values/cm_strings.xml | 7 - - res/values/colors.xml | 20 ++- - res/values/dimens.xml | 33 +++- - res/values/donottranslate.xml | 6 +- - res/values/fractions.xml | 6 + - res/values/strings.xml | 12 ++ - res/values/styles.xml | 159 +++--------------- - res/values/themes.xml | 2 +- - res/xml/digital_appwidget.xml | 13 +- - .../DigitalAppWidgetCityViewsFactory.java | 10 +- - ...DigitalAppWidgetConfigurationActivity.java | 50 ------ - .../alarmclock/DigitalAppWidgetProvider.java | 60 ++----- - src/com/android/alarmclock/WidgetUtils.java | 28 --- - src/com/android/deskclock/ClockFragment.java | 1 + - .../deskclock/DropShadowController.java | 2 - - src/com/android/deskclock/FabContainer.java | 2 +- - src/com/android/deskclock/FabController.java | 2 - - src/com/android/deskclock/FragmentUtils.java | 5 +- - .../deskclock/ScreensaverActivity.java | 24 +-- - src/com/android/deskclock/Utils.java | 19 ++- - .../actionbarmenu/MenuItemController.java | 4 +- - src/com/android/deskclock/data/DataModel.java | 11 +- - .../android/deskclock/data/RingtoneModel.java | 5 +- - .../deskclock/data/SilentSettingsModel.java | 4 +- - .../deskclock/data/StopwatchListener.java | 4 +- - .../deskclock/data/StopwatchModel.java | 4 +- - .../data/StopwatchNotificationBuilder.java | 3 +- - src/com/android/deskclock/data/Timer.java | 2 +- - .../android/deskclock/data/TimerModel.java | 4 +- - src/com/android/deskclock/provider/Alarm.java | 2 +- - .../ringtone/AddCustomRingtoneViewHolder.java | 1 + - .../ringtone/RingtonePickerActivity.java | 18 +- - .../settings/AlarmVolumePreference.java | 3 +- - .../deskclock/settings/SettingsActivity.java | 2 +- - .../deskclock/stopwatch/StopwatchService.java | 4 + - .../android/deskclock/timer/TimerAdapter.java | 5 +- - .../deskclock/timer/TimerFragment.java | 8 +- - .../android/deskclock/timer/TimerItem.java | 2 + - .../android/deskclock/timer/TimerService.java | 4 + - .../deskclock/timer/TimerViewHolder.java | 14 +- - .../uidata/PeriodicCallbackModel.java | 1 - - .../widget/CollapsingToolbarBaseActivity.java | 3 + - .../deskclock/widget/MockFabContainer.java | 27 ++- - 75 files changed, 389 insertions(+), 934 deletions(-) - create mode 100644 res/drawable-nodpi/appwidget_digital_clock_preview.png - create mode 100644 res/drawable/ic_checkmark.xml - delete mode 100644 res/drawable/widget_background.xml - delete mode 100644 res/drawable/widget_configuration_background.xml - delete mode 100644 res/layout-night/digital_widget_preview.xml - create mode 100644 res/layout/day_button.xml - delete mode 100644 res/layout/digital_widget_configuration.xml - delete mode 100644 res/layout/digital_widget_configuration_preview.xml - delete mode 100644 res/layout/digital_widget_configuration_preview_solid_root.xml - delete mode 100644 res/layout/digital_widget_configuration_preview_transparent_root.xml - delete mode 100644 res/layout/digital_widget_darkbg_solid_theme_root.xml - delete mode 100644 res/layout/digital_widget_darkbg_theme_root.xml - delete mode 100644 res/layout/digital_widget_lightbg_solid_theme_root.xml - delete mode 100644 res/layout/digital_widget_lightbg_theme_root.xml - delete mode 100644 res/layout/digital_widget_preview.xml - delete mode 100644 res/values-night/styles.xml - create mode 100644 res/values-w360dp-h420dp/bools.xml - create mode 100644 res/values-w470dp-land/bools.xml - delete mode 100644 src/com/android/alarmclock/DigitalAppWidgetConfigurationActivity.java - -diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index 7c127a02c..2d1168ba6 100644 ---- a/AndroidManifest.xml -+++ b/AndroidManifest.xml -@@ -22,7 +22,7 @@ - - - -- -+ - - - -@@ -295,7 +295,6 @@ - - - -- - - - -- -- -- -- -- - - -diff --git a/res/drawable-nodpi/appwidget_digital_clock_preview.png b/res/drawable-nodpi/appwidget_digital_clock_preview.png -new file mode 100644 -index 0000000000000000000000000000000000000000..25a49540bea2f3e9aad790f13cfbab4b1c2a60d5 -GIT binary patch -literal 10832 -zcmeHrXH=6-@Gn+SQ4j>A8z~A>6bL0W3B60`grcC7P?TOG;EO>7BtbxsF1-e%1qe+A -zDbj?HP(o2U2~8kGO5n!-x!>=(U+=kl&YtJ&?r-*)nVs30o!Cbvx>qmrTxMWkxT>$G -z1z}(~3;5TW&eLaP1oD~bpYv`S#u^L^HK;4cPcG2Mw_Nlf#taN$q6`eL5DW~5^r=^? -z3=Dzy85l^985lqx85p=;WMR!z=nH3^4Ry5`7|IibWay(yFZ68v85pjx{p)8&XCjUn -z7{r?NwKOb3rZ#4RKi<$j>G?A&!YJaVef@^kgZR=WMA2&A2 -ztIAJIf&(oZ7U(?uzu6w9lp%vG6tWAS@KjU)ZQ2?d?aFvWT*NA1uskUc#BEh(=Fdk9t$dqIV8PwsQAN^R~Jx;^>71PiBX_$EiuW+QK<{*bwOBrY4^N{ -z)EQ3n&kjn{MR#aaB@)+mXrt~P--^ax!J4RAmN1|`p)ZonBuAES9L(jT0!t1nL{_|? -zSWIDf%EyKE8#!%;g2r!#-#wLIRm!gBw5;VMuD(=7&!xmBgc&A}Rj{_>@p>hz0+J9{ -zwQ-B=@7B6%(n0XGnkHB4`v9#CpuW>xW#}GO3MX$_%<1WYP=>a5^E$|E -z{oe+Cl)Lm0`Gq(-_6=Fp6S$~~D8+WKT3>h;Ya&I;SVu?R)8hp?B!CAZgHVwcNsW?spv2coQE@Mqz6Fy63{E`B?OBVFucelZhK)aLR1hgH -z8S}%QOe5TOX~{YbHb*xcysxn=&d>SObuVIHTW0Uo_^tHauP!PFZ@U-0KSWjM54$jp -za42~}JOe|nJr9qhf8f0eLQ)xc*7$YW5bvaNGlv@Q4kQL_6Oev`pERCxg2Cegx1$lqM;Tr4}V?9XUs|Vi?kLsOlE#=YT;lBw7GGrcX$WUefWuTVlLD=vVAN!YCMpE!Fjd90Ivn14!zvD(%fKv9V -zlJGAnXGCxfa5S2mu6kSrPrf(5ZsU?V!u`>vR4#sCp*FG&r2DzpbWicjxEma81&FS) -zTQ=jZzVMlvYDe}x7v%k@(O_z(pj)BrT+O$jKcQK!Zi>LQdkHgB!1Pnr{8T&d!4=)F -zmF{^ns_kjB`n1-322Z#f%FR=q^ozlKa-^L1#LtM!3*my{8uXn7kq#q%Id&B(o*aMqBL@}TkXFip?B -zidh^pKijVy>TW6Vj8f@`8Uc@NhqAVIpP7|+S@jhU2=zHau20#)YB=|;n2(_>09<9L -z08a?W)CR|W!=0xHE524-Yh)h9W1d%n)_oCd0xPl@hO6)m9)h&asl54VJv?%~^{H|7 -z9W$Y1)>=q#nP-OTA`nrUO<{5z)-V`E$1}dL!^I)*WuG<(xAmc@Qq%K`-UR)U{9WqCy_RNp)Q;p9ZJj3AlItvyPH*Aq-w0;xU9Q -zna(%Z42|#+#Xk$hW5gHQ);%OYJX*fH_AE>@P7YD}hOoGEy}}JkwS$B|NK_5p&#DN3 -z6zxOju!M-ao>3$%GSD)Cnd(>REm@y9MVQ=Em6qHnP#WW8$4{%nj=?omHPZt$rF82G^;_Np5l=xceqoOtE|oTVUv(Tha%KYfORhQI{BfOVMZ=1I -zN%krA8L10%Z1k{Ubup=|d#i&O0~u7B4$APUdWGA5rvUgh#(y0ZKe`F%!iZ|$t+pU+ -zABR`CeV9|ypjJIiIgI;(Vjf9O4QFN%JLUI^_wbw5RYTZp)o{fGbhS)c-4Xl66Q-Q| -zx}H)dLV3cyxxnAAcDO{bsuXpL7^5G{!P+HXz8*74^7jMe1*oPI)Q|X}e#~3iXDj!& -zn#sto%j#&&ACcjnOddn&f)rLi7snOG$aGXspX~}kUa{QQy^J_}-`^cE6%6-eDjWQV -z*|9b(=RyPxV6NfSZ@AOO>P&W6yz$nwr}`b{h$-q<4EMJz>Ie$}^B*o|iSltv;^(19 -zVavT^qsx+kN9^f3*I{!suPesBv%2bt3CC1CsNSW$H|em${Yq*Q%o{o`57B)LKiL-r -z^8TSG1_y0TWA6`mU+~uue8FRP`k~f#%?TL^VN6Pj9aqi0(S|HFw;aDG@wkbVW!_FX -zg%R4blFKGbV-njB!i^IRDh*kH1wf0tWp160BOn?oAjxOR8Ot$sngDQ%&G#HW$fkcyQP*=RJ%Y6CEWG`{-n&T8S8wA^C=N$M1eM -zXQ|dTuXF1?BRum4r5S-i1OL76i@ZY~g~*mo&NBh3ZAVq;Tw>aw8#;EH_Lr`{-T5Tb -zKv2L$7o_JwB>;=rFH!P89a8zG!JhY*%=1kpL;`%Y{N^5>VrIMS9}aRFGSwK@k~v9c -z#O^E88gz_HW)?<*8t=lGM76VfeD&593xoebp%Hiyx;ogaFY1|r0x90@%B^)naOF0S -ztGD90lkJQEPkq}Rjh^~#>l$7YC^$DRjD{Z3Sr^|KShC>G -zgIg7l-wSsV+(en_XtoIHUNV8b*2&Q?8T}n=6R1>jiO%9S^s58Gd}mW-Nfatby4>(P -zOBBHh{^oOTzvh-;sZ|$P@4)|KD39IE;lzIum5-d=Z@e~OS8y$~|NYt3M{P<5)f>We -zihSs)WJ6aN+y1aiPE?JZwf0&x2Yp)ahG$3BY+X)7@DkA4)Wak?*Nu{)HfnvS&nwF$ -zG#B0SN%Ws24WxF9)6Y2})tvjKm+^!ukTJVl54QD5ZP@_{M+bo8+BWY%O`EIp>lINv -zr5z{f&KcRlZJkEkbcu!k$~1im!=guguB)V8&qFGG)B0^18R0^kdS5F3tJCV+R#ZrdEj^UBcYLrR2TWQ~vGj^c^+$Xh8xclVkac -z*f8v*(A$@Ju33NnNwaixRSlE#c-OMP9qHTD1J-)Jefurl?452b?)1x+YlV;3w<9g= -zDn+#evouu+T+MI&+i!wHRl;*W?T0u@=Ol@9TnHp8`QdA5TPhVQIk -zwah4As2_*!SBu8%{sQIeT|{R)tJOaNe=;blG&VR-`B?~LRKuJd -zz0hp*CpwW)!o!h+?wnSa`62az(-!e6jwz2Wq%Mtk5!qt14o0p4A~A(ZYIMiEA19qN -zv|~eFmGoq=Eyq~qN3(nuQ1uTM;s;j^1efGcpa;M5E9W3I+`==w<)TB~6yb2T#axM6 -zzz4p#1dn)g;?}3pLq{lAo_Sh;tOR?%tSUP1^LrZQ$D}lrv}_0v@b@Mcw2Nxnv(nOy@M*^Sz>%|F=kp*c!nFWK1nPRa*6`@F}KeeAqd -zeV0q^K6ow=Z4C2e-6B&odwEkW82?3|>+y|TmS_y2k$_v?C_fmorMZg5Z)VZx%&^!& -z__?MYbinj!qxpvf+FQ#OHiIrqFFy8vmNAx{0xTOJy-@)u$qXKJ9+wK?+F<8BDZB$s -z{CNFFnAB_)$+Rd=8j+RQq0u7{+^sDO!G%SqHF6A43Pq%?V{+mZDu&z_%h|vgwt{uh -zI~Og;LhYv<#^Fe+jm0WLWohNQp^wiMRjyp9-$+88`ZqwAZ~a7)&sJ;pQ&SFo@0^tf -zDeFOVpkH6DVCg6hv4F~+e6Ye|P57i^@3viU -z=-q~EH5L7nf*Y(d(@C3+fI{N*RMy$d2l-#^KIKj~{us6#X7%(_r#WA}73xr6m^PKe -z9Gw+YjPZCwKP47`L*-zb;Sf%>AJi0{`EY**Y-(*&vMZ0jR3t$3Xl~GQ>fItf38)t_ -zC3o`1t}7x7kOwR-h(!Cs<3P1T62)e-_^-!*6ybJRM6FkTG@)LdSya*LwwpKl0Hidg -zlI7L+m7I0-FEYlcM?#7S$cBfr!WI51SeeGvFMNWQ-ehsF(MH$@>b|9OTU!P7u??=E_0cu`T}WH5tN{w<^}CGZom{QgRxUG>k4 -z{+smFVeE6eLj>3a_i{REe&xUQ=A53cF#SWdlAb*-&kS;Bc(Zlfv4hW`le?inSpuaZ -zjw^sp6k-$%t>{)VtS+FaR{S?GIC5f8WY&Af-S)S{ddbj1cuCgK(5cHauwK>ZCeP;G -zi{zhMG8;F0+o^ijAO5gV*VP@HTbNp@je@y2L95U0Ulya3NR~N$O?SEh=yDOE0Gkhn -ztdzZLRri?Pw}5E4bfcnf(YPkLU^@cj;61q1`e<}^I3tL0=-BxZptF+WWw^;Gc09xC -z^vnKfjvM{>@ATAFSlOCqI=F9@n48ml2G{ffg|x~Ino<_^J3AOtlXFq2>DovT;Tc0( -zx$9%G0BTd2O>(^L7g*8r%Ca`Qw_7DRW)#H`wyZegLkQ@3G0SDl^ry8qTxQ}q#1hv} -z2zbMo@net>k;vC7X+xoCq|BO@WUI`sD$6!n8-?{HE$_T!X%s@7&x}wdgUZiTKXFxU -zE)vm*bRkh5F09I+N^XXq -zGyE-wT2_`|)U87!$3J8gD+ksfdj}cB$;z=s4Np`TdUrtE4k)`OVO_DDwFiqGbm|GP -zo;S)jn_LgQb+k4A;5DVrelB*UwDn~1PXxB$vdSFXy`bm(E1ZAg6hNT*i{d-~_EoT6 -z9J2TO2SLr!V#4=?LP^lwBuZdaPw>Iy_1>eaISa0$7nE~tW-9&j3M2ixxt=lo>D4}9 -zPtN(kY(js}^Yx{vt=>e9+!@!oO>NjqUwOS19A%ecE5fs3W}sf7>h`kcO(OR2n|}^@ -zV%;&Pkj-JCCN6EyvZ_0Nxjto|03we}^QH@}ri{&G{oPi6rEsaN$Z>Dt^zc5{tJ?@f -zE^3INAH2j_YTSL~S+$}{Z8U*veJ&2#R;1mgM1VH(i^Pi0wpN(eZf#odJCt(dIBC-q -ziSZzWA~G!0QC3fV4Rp#Pfj20q+=`2x3DtdZ5D6SD5l~>b4n1eVuku`KCLPC<6sp^3 -z=MmNNt8nIf7Fk;m%%{s$Z;t`&)C8A3>@zfz?tj>NemFvhkXoK*PC% -ziQyYVyW;G0#?F}!grNUM6>T*L4+3?ali#f_RqEWZreFNP{f`RCB=J36$x#UT9_GV5 -z=U?HW9dQmiQJZScnl%Ay&-~;z!eYJ@IclvmG}E6R+$FR_zgEX|cF#UH+G4B&ivxt4 -zSmzbXOT-8t7Nb6!65t67i?9|fsI291)jna&80%CAbWrfD -zAHwy4ELymR1L-CI|I79z{>|D8K`4F%4b$^D^Ol7fAJ9^0IVCa}BoYQ5bt64YKlAp& -zn~R5OKO_ypqw{<>gYMyz{m%VTL>-M@A%O2{b>3lKp(QiGcn{5c -z(a~DAXJo{VpG)G$UNq5wseIKT3}#C?#2Q}U^#-I -z^h6Nek}De6U*-|lCXf+`Jjw`v_xU8^(*aFeY=89o%(9%5*oRa5PmWXC_}X57%hI~n%m(qtvvABwqNc8SMsCe(WL5*3|Qj6z+`eib7C(C>^teVWinUfF -zLHzine>x`diJePC#DiFL?2*#lSFE+g--bUv1osB_X;-Ygj7|jjLI({qM=vT2|GBy# -zt>zDpK8QcS>ds}Js%F+ZoRjp8tg~k!aVJ})pY}h-kB)CT4aPnH469Vw)A4h$miG2* -zR2x}2arye2X}51>Ib@oA9xto(JjvKl@9wS>o5?rwJ^WB(kn|}Ol_8xdIYnHVqdu~g -zuqO!^1KUh9lb;J(I5>U$9Zp>n^M|JYzElZGek063FNDxrv1~f97}C@ON5x?EX`9X3 -z7(k)pt7fC)9D~+mA0LzWF~A}ovDwW(S{P8Lqzzvc+6_(!UkoIB<6ksZyW}68QeqV} -zmw8ukJMaMS=Q^RsBf))L-|#Kv+1sIp`lB=sOh<3w8krZuf+ae6v`;pYRw4+JL5EMr -z+1UE+(SccNLF$th>F`k8*O$#i^FIkkr}ti-gs-QM?=Fq!mV5eus`aOKRH(ZO{V2=u -z!MfTE?xnxmh#<8YYo_$vJtC0_P{uQv8h7W7l*!+0T_!WQKTlfAkP|&j^o$^vtC8E3 -z8OzO%nhKEy;IpI&5nAn$N91nbxy?Iu;i-n2=m3Z#OCs)nB};M){i#qC&`Mme5VDsAY5z(sLEiyXr28Gcp4uU -zky3ob=dAgIl`T`y4-FrzohUG0ug07(g|nW9r;1i{k%DPebHG8r;EWfS&|5Q-!IeKN -zc2kD^l;$d^!rDx0tEpcY+aVJ|oUF+vn)+emv~@M=Dc8k+(U5;&@XH@tDk7!1(ac9M -zRVrR}!enYkyhBy17~he&cW|4!dvQ6rZ}SfK-b!gZoVU>^()aYRG6k@BmC988?r3IY -zbIVZ#F~MtFd3`SyKKjT?=m$3)A`Mqg!>#zJy|LZiIG -z;q-3Z=DRe}6HUG81d0(0zejYl)z=)%WrM9 -zz*m<}BL8a>)H7|)jrnDw)p$RwNtP|FX4%}8ZG0nL!VEC=bo6VV -z;T>MWmeC*ZXGlrg=CZF?M{#YrK(0eH}<_>`tru>7Qqk?#e-&C|q_I&E> -zdk^l#;D}0IOA(($%>HD0Qg+GLScTs54U@vGd@*`WA!&o}A=4WAQc~fZbDi>@p#CVI -zdBQ#`8}F#R-8X?{ZXjw2467rSoyr+f12W^b4_{}1PE@Th$ck*PtO{#&Q}sh(pRSZgl0 -zYW+C=65OVWCO-C}`C01p>0q#9aKLlJlakRU-aIk{kr+Ji@ItT(^02vMQkTjOUQbxJ -zFn4&(wmEi`2~cu^nx+SCCTLxuCq#pkcAT6Tt(?OykHdFC9@CZc@M+3!_p -z2ARdLw7bwwdY*EE`Fh&W@L6l|p60S?Pm|(P5VF`HX&HpPi0#N_eZi!pMrg2!4KmN? -zN*>+J`R+Kc*_+WtY+%sry-Ahc44`}BxJ|F&b?^yUar2c%@H^zm6Sc?`R_EtWS3W9F -zbJ44W)5`6+mQZ*R6TnSG?L>x}C0(Q^HaX?xnp|4d3_lqQ8f0%=>MK5a@p-GQN8sn? -zdtau|POD%6qI_)liW2fDYf-?wxWW%|Fd^{+GcH<#h<9vI25LI`^S_~kSThu(TwS3C(#3oIf& -zXw`3%oi-P07#||##TJ{c7b51il5QhZHf0kwm*xBTUp?0;GTLPZsM8Ic95c}nPwclY -z#vol_(RXC@6V}Ch%&t(64q1vP;N7YN<*eW_!n+4Ab!2C9Egfk~qD2ZolZAjbr3UE% -z#bNwFyA`pDeIBFI`>ro5)$Foc7`3JepcOVQuh6rh5jNunVo4`{_w)XDGRTc9lmg+k -zE5mPcHrUfASj*tGUa~!z7p_hx7U8B%)q1h~-8y}(xdG@kg8#HzS{G-~PV#cYc{*3^ON({aM#ZOE&O2g@wNofXdQZNx}418%IBYIC|Q=b -z#$^~%{=ZM -zf0bwMVer@h&kz}!PUL?2P!8tFI8Vm*n)aEP#IME2wf4_v-|g}9k2mm>`KUEnuVC)w -z#U2^OK4>m{K!2SP(XPW)Io(vC@9AUvX?suJt?IQMU!~j@>w8Ii@Plo6T&xo-KzN^j -z&;MYTnY#RIy#Bfj7hutq`t3mkclOXFE{Z-ti!oy>p^-hpS?GRovF8vLAJ7Hd%brtD -zR}#2WIPC+MMZ+Sj%saWT)_OUwzce&97t$2vz55rdO17Z2e|OaGlresh*~HWWw9XBn -zXC^9%1A<9{@|iWQp5jJhl~q9;J(B5SZ;H3NBqFv$M^nw&W3tjK;%djjA1`mYoLlTL -zb}!h<#1Q2z`$*WPu#eeeN>ElnVZxfyU!B(tG5ceWWRC(u<4o$~<%HK(ULjnSAVNTy -zKX;+y@?4d33|T>)xw -zxf@I)dZWufd|m?Zl)aB_91{!s=)5_04OVn-uyr*~$R<_qP%PB7vU$`oPj<}4SnkWq -zKf(#6BSV{#qhVJenj6l`$l;w2xQ&5#sW}3)#PMQgz{Wgm1#y;{9xKgNr9S@BAG!evYu6u5D+~+PK35b)F!zZgQeb6JeM!ihMBG5p_0iMPeTeLR#Yxc6` -zHv4=sl{iBG{JQop(~0SpG=D~V#0VXQxxTs9b-Y~dt&CLLg*i<1tZ)3HCp1xipLks0 -zrX#&6iEt%*0qHH2Q?6`0D?}kV{aq?Ce&>wwuw}@X^qb)2spl?iC(ef73~Kfn-_@K@ -z5}XA{^Y~u!i+4ldmgYI4uz3N4g)23E^>n9*VMx-tUYpXnA)~) -zXK#^soI#vLl#J}A>8KV%6ZiLb@7i1q_!RV8#OaCL8{AAxLW5YmLF&^o -z+nf?3m(~@{icH%EPxRdL-Y8{4bh^5uZjJo$jvARL7R&I%4_c>_x>t13M!+-(3DphI -zEVqW-*z* -z2uwLGpJvm#TP!-KmE0gRbI9HMNy|`9YBSK>(Gj%;LQX%}CoqP|WR6GWDe{IJ|G4#w -z&AX%r@=o8jv|XF^uIHoShf=1sNUYA5@P(vjSktz9brWY_m2>Fvc(CvnXn<^I>NPRd -mX8)Hpi~kS*KWgC9FPeIIobjy*^~&gfV0~>9tt#;2sQ(2`oXscz - -literal 0 -HcmV?d00001 - -diff --git a/res/drawable/ic_checkmark.xml b/res/drawable/ic_checkmark.xml -new file mode 100644 -index 000000000..ed5c32dde ---- /dev/null -+++ b/res/drawable/ic_checkmark.xml -@@ -0,0 +1,27 @@ -+ -+ -+ -+ -+ -+ -diff --git a/res/drawable/widget_background.xml b/res/drawable/widget_background.xml -deleted file mode 100644 -index 4a9485a7d..000000000 ---- a/res/drawable/widget_background.xml -+++ /dev/null -@@ -1,11 +0,0 @@ -- -- -- -- -- -- -- -diff --git a/res/drawable/widget_configuration_background.xml b/res/drawable/widget_configuration_background.xml -deleted file mode 100644 -index 33eb4a5a7..000000000 ---- a/res/drawable/widget_configuration_background.xml -+++ /dev/null -@@ -1,14 +0,0 @@ -- -- -- -- -- -- -- -- -diff --git a/res/layout-night/digital_widget_preview.xml b/res/layout-night/digital_widget_preview.xml -deleted file mode 100644 -index 1b8a6115d..000000000 ---- a/res/layout-night/digital_widget_preview.xml -+++ /dev/null -@@ -1,59 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -diff --git a/res/layout/alarm_time_collapsed.xml b/res/layout/alarm_time_collapsed.xml -index 101561e43..3f0b64264 100644 ---- a/res/layout/alarm_time_collapsed.xml -+++ b/res/layout/alarm_time_collapsed.xml -@@ -59,7 +59,7 @@ - android:layout_width="wrap_content" - android:layout_height="@dimen/touch_target_min_size" - android:background="?selectableItemBackgroundBorderless" -- android:contentDescription="@string/expand_alarm" -+ android:contentDescription="@string/collapse_alarm" - android:focusable="true" - android:padding="@dimen/checkbox_start_padding" - android:scaleType="center" -diff --git a/res/layout/day_button.xml b/res/layout/day_button.xml -new file mode 100644 -index 000000000..b7099e52d ---- /dev/null -+++ b/res/layout/day_button.xml -@@ -0,0 +1,30 @@ -+ -+ -+ -+ -+ -+ -diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml -index 3dfed7f84..5cf896a84 100644 ---- a/res/layout/digital_widget.xml -+++ b/res/layout/digital_widget.xml -@@ -1,6 +1,5 @@ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -diff --git a/res/layout/digital_widget_configuration_preview.xml b/res/layout/digital_widget_configuration_preview.xml -deleted file mode 100644 -index fbc8a09b5..000000000 ---- a/res/layout/digital_widget_configuration_preview.xml -+++ /dev/null -@@ -1,60 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -diff --git a/res/layout/digital_widget_configuration_preview_solid_root.xml b/res/layout/digital_widget_configuration_preview_solid_root.xml -deleted file mode 100644 -index 100ff35a8..000000000 ---- a/res/layout/digital_widget_configuration_preview_solid_root.xml -+++ /dev/null -@@ -1,17 +0,0 @@ -- -- -- -- -- -- -- -diff --git a/res/layout/digital_widget_configuration_preview_transparent_root.xml b/res/layout/digital_widget_configuration_preview_transparent_root.xml -deleted file mode 100644 -index b935f0dc6..000000000 ---- a/res/layout/digital_widget_configuration_preview_transparent_root.xml -+++ /dev/null -@@ -1,17 +0,0 @@ -- -- -- -- -- -- -- -diff --git a/res/layout/digital_widget_darkbg_solid_theme_root.xml b/res/layout/digital_widget_darkbg_solid_theme_root.xml -deleted file mode 100644 -index 34b9e93a2..000000000 ---- a/res/layout/digital_widget_darkbg_solid_theme_root.xml -+++ /dev/null -@@ -1,14 +0,0 @@ -- -- -- -- -diff --git a/res/layout/digital_widget_darkbg_theme_root.xml b/res/layout/digital_widget_darkbg_theme_root.xml -deleted file mode 100644 -index 4689c21b1..000000000 ---- a/res/layout/digital_widget_darkbg_theme_root.xml -+++ /dev/null -@@ -1,14 +0,0 @@ -- -- -- -- -diff --git a/res/layout/digital_widget_lightbg_solid_theme_root.xml b/res/layout/digital_widget_lightbg_solid_theme_root.xml -deleted file mode 100644 -index cfecdc1b4..000000000 ---- a/res/layout/digital_widget_lightbg_solid_theme_root.xml -+++ /dev/null -@@ -1,14 +0,0 @@ -- -- -- -- -diff --git a/res/layout/digital_widget_lightbg_theme_root.xml b/res/layout/digital_widget_lightbg_theme_root.xml -deleted file mode 100644 -index 82fd72f0e..000000000 ---- a/res/layout/digital_widget_lightbg_theme_root.xml -+++ /dev/null -@@ -1,14 +0,0 @@ -- -- -- -- -diff --git a/res/layout/digital_widget_preview.xml b/res/layout/digital_widget_preview.xml -deleted file mode 100644 -index b2ca0a1be..000000000 ---- a/res/layout/digital_widget_preview.xml -+++ /dev/null -@@ -1,60 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml -index 217686237..f524cf536 100644 ---- a/res/layout/digital_widget_sizer.xml -+++ b/res/layout/digital_widget_sizer.xml -@@ -1,6 +1,5 @@ - - - -+ android:orientation="vertical"> - - -+ android:textColor="@color/white" /> - - -+ android:layout_gravity="center_horizontal|top"> - - -+ android:textAllCaps="true" -+ android:textColor="@color/white" /> - - - -+ android:textColor="@color/white" /> - - -+ android:textAllCaps="true" -+ android:textColor="@color/white" /> - - - -diff --git a/res/layout/world_clock_remote_list_item.xml b/res/layout/world_clock_remote_list_item.xml -index 699d96d18..8513ebefc 100644 ---- a/res/layout/world_clock_remote_list_item.xml -+++ b/res/layout/world_clock_remote_list_item.xml -@@ -1,6 +1,5 @@ - - -- 86dp -+ 96dp - -diff --git a/res/values-h650dp/dimens.xml b/res/values-h650dp/dimens.xml -index de043fd26..7c52196c0 100644 ---- a/res/values-h650dp/dimens.xml -+++ b/res/values-h650dp/dimens.xml -@@ -16,5 +16,5 @@ - - - -- 90dp -+ 100dp - -diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml -index 8ad2d7b05..483ac25e1 100644 ---- a/res/values-land/dimens.xml -+++ b/res/values-land/dimens.xml -@@ -21,6 +21,7 @@ - 24dip - - -+ 70dp - 168dp - - 0dp -diff --git a/res/values-land/fractions.xml b/res/values-land/fractions.xml -index df50736a8..23c0a9ef1 100644 ---- a/res/values-land/fractions.xml -+++ b/res/values-land/fractions.xml -@@ -15,6 +15,12 @@ - --> - - -+ -+ -100% -+ -+ -+ 100% -+ - 0.25 - 0.75 - -diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml -deleted file mode 100644 -index c26e26089..000000000 ---- a/res/values-night/styles.xml -+++ /dev/null -@@ -1,15 +0,0 @@ -- -- -- -- -- -diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml -index 2c55578de..157e8b4ba 100644 ---- a/res/values-sw600dp-land/dimens.xml -+++ b/res/values-sw600dp-land/dimens.xml -@@ -21,7 +21,8 @@ - - - 0dp -+ 48dp - - -- 90dp -+ 100dp - -diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml -index 86bc89581..2c3a50de6 100644 ---- a/res/values-sw600dp/dimens.xml -+++ b/res/values-sw600dp/dimens.xml -@@ -29,19 +29,24 @@ - 125sp - 115sp - 18sp -+ 18sp - 20sp - 48sp - 20sp - -+ 32dp - 180dp - 80dp - - 8dp - -+ 46dp -+ - 8dp - - - 48dp -+ 96dp - - - 200dp -@@ -49,14 +54,14 @@ - 170dp - - -- 130dp -- 80dp -+ 300dp -+ 170dp - 15dp -- 48sp -- 56sp -+ 52sp -+ 65sp - - - 20dp - -- 112dp -+ 125dp - -diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml -index 8b786f0e9..92f495a76 100644 ---- a/res/values-sw720dp/dimens.xml -+++ b/res/values-sw720dp/dimens.xml -@@ -22,5 +22,5 @@ - 312dp - - -- 124dp -+ 138dp - -diff --git a/res/values-w360dp-h420dp/bools.xml b/res/values-w360dp-h420dp/bools.xml -new file mode 100644 -index 000000000..0708712f7 ---- /dev/null -+++ b/res/values-w360dp-h420dp/bools.xml -@@ -0,0 +1,19 @@ -+ -+ -+ -+ -+ true -+ -diff --git a/res/values-w470dp-land/bools.xml b/res/values-w470dp-land/bools.xml -new file mode 100644 -index 000000000..958e07c92 ---- /dev/null -+++ b/res/values-w470dp-land/bools.xml -@@ -0,0 +1,20 @@ -+ -+ -+ -+ -+ true -+ true -+ -diff --git a/res/values/attrs.xml b/res/values/attrs.xml -index 2eb1ab4c8..9a619bced 100644 ---- a/res/values/attrs.xml -+++ b/res/values/attrs.xml -@@ -47,17 +47,4 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- - -diff --git a/res/values/bools.xml b/res/values/bools.xml -index c89c10303..3683454b6 100644 ---- a/res/values/bools.xml -+++ b/res/values/bools.xml -@@ -16,4 +16,6 @@ - - - false -+ false -+ false - -diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml -index 8bb085635..6da5ce9ec 100644 ---- a/res/values/cm_strings.xml -+++ b/res/values/cm_strings.xml -@@ -59,11 +59,4 @@ - Selected - - More options -- -- -- Choose your style -- -- Unbacked -- -- Backed - -diff --git a/res/values/colors.xml b/res/values/colors.xml -index cd1ea9060..91ca13873 100644 ---- a/res/values/colors.xml -+++ b/res/values/colors.xml -@@ -18,6 +18,7 @@ - - - #FF000000 -+ #DE000000 - #8A000000 - - #FFFFFFFF -@@ -28,8 +29,15 @@ - - #00000000 - -+ #28FFFFFF -+ -+ #B3FFFFFF -+ - @android:color/system_neutral1_900 - -+ -+ #000000 -+ - @android:color/system_accent3_200 - @android:color/system_accent2_200 - @android:color/system_neutral1_800 -@@ -50,6 +58,7 @@ - - @color/system_neutral2_500 - -+ @android:color/system_neutral2_100 - @android:color/system_neutral2_300 - @android:color/system_neutral2_500 - @android:color/system_neutral2_700 -@@ -57,13 +66,8 @@ - @android:color/system_neutral1_50 - - @android:color/system_accent3_100 -+ @android:color/system_accent3_200 -+ @android:color/system_accent3_600 -+ @android:color/system_accent3_900 - -- @android:color/system_accent1_100 -- @android:color/system_accent1_700 -- @android:color/system_accent1_200 -- @android:color/system_accent1_600 -- @color/white -- @color/black -- @android:color/system_accent2_100 -- @android:color/system_accent2_800 - -diff --git a/res/values/dimens.xml b/res/values/dimens.xml -index bf5128d1a..c136fe25a 100644 ---- a/res/values/dimens.xml -+++ b/res/values/dimens.xml -@@ -32,6 +32,7 @@ - - 16sp - -+ 16sp - 6dp - 12dp - 240dp -@@ -60,11 +61,14 @@ - - 4dp - -+ 14sp - 6dp - -+ 24dp - 90dp - 56dp - -+ 22dp - 4dip - - 4dp -@@ -73,6 +77,7 @@ - - - 16dp -+ 60dp - 294dp - - -@@ -81,18 +86,29 @@ - 110dp - - -- 202dp -- 80dp -+ 206dp -+ 129dp - 10dp -- 24sp -- 36sp -+ 32sp -+ 40sp - - - 10dp - -- 80dp -+ 88dp - 80dp - -+ -+ 2.75 -+ 2.0 -+ 2.0 -+ -+ -+ 1dp -+ -+ -+ 6dp -+ - - 48dp - -@@ -105,6 +121,9 @@ - - 12dp - -+ -+ 8dp -+ - - 16dp - -@@ -125,8 +144,4 @@ - 4dp - - 0.5 -- -- 80dp -- 12dp -- 16dp - -diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml -index c2a2ea6bc..76dae4905 100644 ---- a/res/values/donottranslate.xml -+++ b/res/values/donottranslate.xml -@@ -16,9 +16,9 @@ - - - -- hmm -+ h:mm - -- kkmm -+ kk:mm - -  / EEE - -@@ -29,6 +29,4 @@ - digital - - A -- -- EEE MMM d - -diff --git a/res/values/fractions.xml b/res/values/fractions.xml -index e3048d4c5..3cee14c62 100644 ---- a/res/values/fractions.xml -+++ b/res/values/fractions.xml -@@ -15,6 +15,12 @@ - --> - - -+ -+ -100% -+ -+ -+ 80% -+ - 0 - 0.25 - -diff --git a/res/values/strings.xml b/res/values/strings.xml -index 400a8ec7b..443d182e3 100644 ---- a/res/values/strings.xml -+++ b/res/values/strings.xml -@@ -32,6 +32,9 @@ - - Vibrate - -+ -+ Repeat -+ - - Delete - -@@ -480,6 +483,8 @@ - Cities - - Settings -+ -+ Help - - Screen saver - -@@ -892,8 +897,12 @@ - Timer paused - - %d timers paused -+ -+ Tap to see your timers - - %d timers -+ -+ Next timer: %s - - - -@@ -929,6 +938,9 @@ - - Yesterday, %1$s - -+ Tomorrow -+ -+ Yesterday - - - Next alarm: %s -diff --git a/res/values/styles.xml b/res/values/styles.xml -index 98bd74f52..8c6364344 100644 ---- a/res/values/styles.xml -+++ b/res/values/styles.xml -@@ -22,10 +22,27 @@ - @color/white_63p - - -+ -+ - - -+ -+ - - -+ -+ - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -diff --git a/res/values/themes.xml b/res/values/themes.xml -index 98d7b634d..08921baec 100644 ---- a/res/values/themes.xml -+++ b/res/values/themes.xml -@@ -15,7 +15,7 @@ - limitations under the License. - --> - -- -+ - - -+ -+ -+ -+ - -diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -index b54a500c5..fb1b30aa7 100644 ---- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java -+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -@@ -223,7 +223,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - if (Utils.isWidgetClickable(wm, widgetId)) { - final Intent openApp = new Intent(context, DeskClock.class); - final PendingIntent pi = PendingIntent.getActivity(context, 0, openApp, FLAG_IMMUTABLE); -- rv.setOnClickPendingIntent(R.id.digital_widget, pi); -+ rv.setOnClickPendingIntent(R.id.digital_widget_actual, pi); - } - - // Configure child views of the remote view. -@@ -255,7 +255,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - final int targetWidthPx = portrait ? minWidthPx : maxWidthPx; - final int targetHeightPx = portrait ? maxHeightPx : minHeightPx; - final int largestClockFontSizePx = -- resources.getDimensionPixelSize(R.dimen.widget_max_clock_font_size); -+ resources.getDimensionPixelSize(R.dimen.sc_keyguard_clock_text_size); - - // Create a size template that describes the widget bounds. - final Sizes template = new Sizes(targetWidthPx, targetHeightPx, largestClockFontSizePx); -@@ -327,13 +327,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - } - - // Measure the widget at the largest possible size. -- Sizes high = measure(template, template.getLargestClockFontSizePx(), sizer); -+ Sizes high = measure(context, template, template.getLargestClockFontSizePx(), sizer); - if (!high.hasViolations()) { - return high; - } - - // Measure the widget at the smallest possible size. -- Sizes low = measure(template, template.getSmallestClockFontSizePx(), sizer); -+ Sizes low = measure(context, template, template.getSmallestClockFontSizePx(), sizer); - if (low.hasViolations()) { - return low; - } -@@ -345,7 +345,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - return low; - } - -- final Sizes midSize = measure(template, midFontSize, sizer); -+ final Sizes midSize = measure(context, template, midFontSize, sizer); - if (midSize.hasViolations()) { - high = midSize; - } else { -@@ -411,7 +411,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - * the offscreen {@code sizer} view. Measure the {@code sizer} view and return the resulting - * size measurements. - */ -- private static Sizes measure(Sizes template, int clockFontSize, View sizer) { -+ private static Sizes measure(Context context, Sizes template, int clockFontSize, View sizer) { - // Create a copy of the given template sizes. - final Sizes measuredSizes = template.newSize(); - -@@ -422,13 +422,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - final TextView nextAlarmIcon = sizer.findViewById(R.id.nextAlarmIcon); - - // Adjust the font sizes. -- measuredSizes.setClockFontSizePx(clockFontSize); -+ measuredSizes.setClockFontSizePx(context, clockFontSize); - clock.setText(getLongestTimeString(clock)); - clock.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mClockFontSizePx); - date.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx); - nextAlarm.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx); - nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx); -- nextAlarmIcon.setPadding(measuredSizes.mIconPaddingPx, 0, measuredSizes.mIconPaddingPx, 0); -+ nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0); - - // Measure and layout the sizer. - final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx); -@@ -509,12 +509,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - private int getLargestClockFontSizePx() { return mLargestClockFontSizePx; } - private int getSmallestClockFontSizePx() { return mSmallestClockFontSizePx; } - private int getClockFontSizePx() { return mClockFontSizePx; } -- private void setClockFontSizePx(int clockFontSizePx) { -+ private void setClockFontSizePx(Context context, int clockFontSizePx) { -+ final Resources resources = context.getResources(); -+ int keyguardClockTextSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_clock_text_size); -+ int keyguardRowTextSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_row_text_size); -+ int keyguardAlarmIconSizePx = resources.getDimensionPixelSize(R.dimen.sc_keyguard_alarm_icon_size); -+ int alarmIconPaddingPx = resources.getDimensionPixelSize(R.dimen.alarm_icon_padding); - mClockFontSizePx = clockFontSizePx; -- mFontSizePx = max(1, round(clockFontSizePx / 7.5f)); -- mIconFontSizePx = (int) (mFontSizePx * 1.4f); -- mIconPaddingPx = mFontSizePx / 3; -- } -+ mFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardRowTextSizePx)); -+ mIconFontSizePx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) keyguardAlarmIconSizePx)); -+ mIconPaddingPx = max(1, round(clockFontSizePx / (float) keyguardClockTextSizePx * (float) alarmIconPaddingPx)); -+ } - - /** - * @return the amount of widget height available to the world cities list -diff --git a/src/com/android/deskclock/AlarmUtils.java b/src/com/android/deskclock/AlarmUtils.java -index c3739bac8..5b931a46d 100644 ---- a/src/com/android/deskclock/AlarmUtils.java -+++ b/src/com/android/deskclock/AlarmUtils.java -@@ -38,7 +38,7 @@ import java.util.Locale; - public class AlarmUtils { - - public static String getFormattedTime(Context context, Calendar time) { -- final String skeleton = DateFormat.is24HourFormat(context) ? "EHm" : "Ehma"; -+ final String skeleton = DateFormat.is24HourFormat(context) ? "Hm" : "hma"; - final String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton); - return (String) DateFormat.format(pattern, time); - } -diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java -index bf53584e4..7a0e3ae0b 100644 ---- a/src/com/android/deskclock/ClockFragment.java -+++ b/src/com/android/deskclock/ClockFragment.java -@@ -123,7 +123,6 @@ public final class ClockFragment extends DeskClockFragment { - Utils.updateDate(mDateFormat, mDateFormatForAccessibility, mClockFrame); - Utils.setClockStyle(mDigitalClock, mAnalogClock); - Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock); -- Utils.updateDateGravity(mClockFrame); - } - - // Schedule a runnable to update the date every quarter hour. -@@ -151,7 +150,6 @@ public final class ClockFragment extends DeskClockFragment { - if (mDigitalClock != null && mAnalogClock != null) { - Utils.setClockStyle(mDigitalClock, mAnalogClock); - Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock); -- Utils.updateDateGravity(mClockFrame); - } - - final View view = getView(); -@@ -493,7 +491,6 @@ public final class ClockFragment extends DeskClockFragment { - Utils.updateDate(dateFormat, dateFormatForAccessibility, itemView); - Utils.setClockStyle(mDigitalClock, mAnalogClock); - Utils.setClockSecondsEnabled(mDigitalClock, mAnalogClock); -- Utils.updateDateGravity(itemView); - } - } - } -diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java -index 4eea6beba..4a5ad5a0a 100644 ---- a/src/com/android/deskclock/Utils.java -+++ b/src/com/android/deskclock/Utils.java -@@ -52,9 +52,7 @@ import android.text.style.RelativeSizeSpan; - import android.text.style.StyleSpan; - import android.text.style.TypefaceSpan; - import android.util.ArraySet; --import android.view.Gravity; - import android.view.View; --import android.widget.LinearLayout; - import android.widget.TextClock; - import android.widget.TextView; - -@@ -302,23 +300,6 @@ public class Utils { - dateDisplay.setContentDescription(new SimpleDateFormat(descriptionPattern, l).format(now)); - } - -- public static void updateDateGravity(View clockFrame) { -- View dateAndNextAlarm = clockFrame.findViewById(R.id.date_and_next_alarm_time); -- LinearLayout.LayoutParams lp = -- (LinearLayout.LayoutParams)dateAndNextAlarm.getLayoutParams(); -- -- final DataModel.ClockStyle clockStyle = DataModel.getDataModel().getClockStyle(); -- switch (clockStyle) { -- case ANALOG: -- lp.gravity = Gravity.CENTER; -- break; -- case DIGITAL: -- lp.gravity = Gravity.START; -- break; -- } -- dateAndNextAlarm.setLayoutParams(lp); -- } -- - /*** - * Formats the time in the TextClock according to the Locale with a special - * formatting treatment for the am/pm label. --- -2.34.1 - diff --git a/patches_platform_personal/packages_apps_DeskClock/0004-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch b/patches_platform_personal/packages_apps_DeskClock/0004-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch deleted file mode 100644 index 0e090e4..0000000 --- a/patches_platform_personal/packages_apps_DeskClock/0004-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 169570068c3a78f7294d581b2df864ccd3057579 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Thu, 20 Jan 2022 04:42:03 +0000 -Subject: [PATCH 4/4] DeskClock: Wallpaper-based text coloring for digital - clock widget - -RemoteViews is such a restrictive PITA - -Change-Id: Ie22c4980526575f73ebb4e56780d4c2193cc45d3 ---- - .../alarmclock/DigitalAppWidgetProvider.java | 57 +++++++++++++++++++ - 1 file changed, 57 insertions(+) - -diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -index fb1b30aa7..c04528240 100644 ---- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java -+++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -@@ -38,6 +38,8 @@ import static java.lang.Math.round; - import android.annotation.SuppressLint; - import android.app.AlarmManager; - import android.app.PendingIntent; -+import android.app.WallpaperColors; -+import android.app.WallpaperManager; - import android.appwidget.AppWidgetManager; - import android.appwidget.AppWidgetProvider; - import android.content.BroadcastReceiver; -@@ -111,12 +113,40 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - /** Intent used to deliver the {@link #ACTION_ON_DAY_CHANGE} callback. */ - private static final Intent DAY_CHANGE_INTENT = new Intent(ACTION_ON_DAY_CHANGE); - -+ private static WallpaperManager mWallpaperManager; -+ private static boolean mDarkText; -+ -+ private static void relayoutAllWidgets(Context context) { -+ final AppWidgetManager wm = AppWidgetManager.getInstance(context); -+ final ComponentName provider = new ComponentName(context, DigitalAppWidgetProvider.class); -+ final int[] widgetIds = wm.getAppWidgetIds(provider); -+ for (int widgetId : widgetIds) { -+ relayoutWidget(context, wm, widgetId, wm.getAppWidgetOptions(widgetId)); -+ } -+ } -+ -+ private static void addOnColorsChangedListener(Context context) { -+ mWallpaperManager.addOnColorsChangedListener(new WallpaperManager.OnColorsChangedListener() { -+ @Override -+ public void onColorsChanged(WallpaperColors colors, int which) { -+ relayoutAllWidgets(context); -+ } -+ }, null); -+ } -+ - @Override - public void onEnabled(Context context) { - super.onEnabled(context); - - // Schedule the day-change callback if necessary. - updateDayChangeCallback(context); -+ -+ // Listen for wallpaper color changes -+ mWallpaperManager = WallpaperManager.getInstance(context); -+ addOnColorsChangedListener(context); -+ -+ // Force a relayout to pick up initial colors -+ relayoutAllWidgets(context); - } - - @Override -@@ -215,6 +245,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - */ - private static RemoteViews relayoutWidget(Context context, AppWidgetManager wm, int widgetId, - Bundle options, boolean portrait) { -+ // Determine text colors. -+ if (mWallpaperManager == null) { -+ mWallpaperManager = WallpaperManager.getInstance(context); -+ addOnColorsChangedListener(context); -+ } -+ WallpaperColors wallpaperColors = mWallpaperManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM); -+ // Live wallpapers might not implement the WallpaperColors API. -+ if (wallpaperColors == null) { -+ mDarkText = false; -+ } else { -+ mDarkText = (wallpaperColors.getColorHints() & WallpaperColors.HINT_SUPPORTS_DARK_TEXT) != 0; -+ } -+ - // Create a remote view for the digital clock. - final String packageName = context.getPackageName(); - final RemoteViews rv = new RemoteViews(packageName, R.layout.digital_widget); -@@ -272,6 +315,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - rv.setTextViewTextSize(R.id.nextAlarm, COMPLEX_UNIT_PX, sizes.mFontSizePx); - rv.setTextViewTextSize(R.id.clock, COMPLEX_UNIT_PX, sizes.mClockFontSizePx); - -+ // Apply the text color to the remote views. -+ if (mDarkText) { -+ rv.setTextColor(R.id.clock, resources.getColor(R.color.black)); -+ rv.setTextColor(R.id.date, resources.getColor(R.color.black)); -+ rv.setTextColor(R.id.nextAlarm, resources.getColor(R.color.black)); -+ } else { -+ rv.setTextColor(R.id.clock, resources.getColor(R.color.white)); -+ rv.setTextColor(R.id.date, resources.getColor(R.color.white)); -+ rv.setTextColor(R.id.nextAlarm, resources.getColor(R.color.white)); -+ } -+ - final int smallestWorldCityListSizePx = - resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size); - if (sizes.getListHeight() <= smallestWorldCityListSizePx) { -@@ -430,6 +484,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { - nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx); - nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0); - -+ // Adjust the alarm icon text color before generating its bitmap. -+ nextAlarmIcon.setTextColor(context.getResources().getColor(mDarkText ? R.color.black : R.color.white)); -+ - // Measure and layout the sizer. - final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx); - final int heightSize = View.MeasureSpec.getSize(measuredSizes.mTargetHeightPx); --- -2.34.1 - diff --git a/patches_platform_personal/packages_apps_Nfc/0001-NfcService-Disable-NFC-by-default.patch b/patches_platform_personal/packages_apps_Nfc/0001-NfcService-Disable-NFC-by-default.patch deleted file mode 100644 index 0160019..0000000 --- a/patches_platform_personal/packages_apps_Nfc/0001-NfcService-Disable-NFC-by-default.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 99b3533fe66a7bdc71dd6c63c4ba6c75e2ef2082 Mon Sep 17 00:00:00 2001 -From: Daniel Micay -Date: Sat, 6 Jun 2015 10:40:51 -0400 -Subject: [PATCH] NfcService: Disable NFC by default - -Change-Id: Ibe6abec7fa84c6fde476b8a083f57a3f61b50909 ---- - src/com/android/nfc/NfcService.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java -index 3facdeeb..878b7e21 100644 ---- a/src/com/android/nfc/NfcService.java -+++ b/src/com/android/nfc/NfcService.java -@@ -133,7 +133,7 @@ public class NfcService implements DeviceHostListener { - public static final String PREF = "NfcServicePrefs"; - - static final String PREF_NFC_ON = "nfc_on"; -- static final boolean NFC_ON_DEFAULT = true; -+ static final boolean NFC_ON_DEFAULT = false; - static final String PREF_NDEF_PUSH_ON = "ndef_push_on"; - static final boolean NDEF_PUSH_ON_DEFAULT = false; - static final String PREF_SECURE_NFC_ON = "secure_nfc_on"; --- -2.25.1 - diff --git a/patches_platform_personal/packages_apps_Settings/0001-Revert-DO-NOT-MERGE-Allow-a-settings-override-for-do.patch b/patches_platform_personal/packages_apps_Settings/0001-Revert-DO-NOT-MERGE-Allow-a-settings-override-for-do.patch deleted file mode 100644 index 4ae6955..0000000 --- a/patches_platform_personal/packages_apps_Settings/0001-Revert-DO-NOT-MERGE-Allow-a-settings-override-for-do.patch +++ /dev/null @@ -1,227 +0,0 @@ -From 4c3fbe18f838dce0c06342016ca4c933cf077a05 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sun, 13 Mar 2022 11:22:48 +0000 -Subject: [PATCH] Revert "[DO NOT MERGE] Allow a settings override for - double-line clock" - -Sorry but I SAID NEVER! - -This reverts commit cb4836b4868adc1f06212ce82851a5f16169ab5c. - -Change-Id: I8b4b1354f23981f6edbe7f3c81ec4f511da3cc1a ---- - res/values/strings.xml | 4 - - res/xml/security_lockscreen_settings.xml | 6 -- - .../LockscreenClockPreferenceController.java | 70 --------------- - ...ckscreenClockPreferenceControllerTest.java | 90 ------------------- - 4 files changed, 170 deletions(-) - delete mode 100644 src/com/android/settings/display/LockscreenClockPreferenceController.java - delete mode 100644 tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java - -diff --git a/res/values/strings.xml b/res/values/strings.xml -index 62062b5fe8..35a8a39689 100644 ---- a/res/values/strings.xml -+++ b/res/values/strings.xml -@@ -13812,10 +13812,6 @@ - Control external devices without unlocking your phone or tablet if allowed by the device controls app - - To use, first turn on \u0022Show device controls\u0022 -- -- Show double-line clock when available -- -- Double-line clock - - Shortcuts - -diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml -index 77a32122ee..b71839fe23 100644 ---- a/res/xml/security_lockscreen_settings.xml -+++ b/res/xml/security_lockscreen_settings.xml -@@ -78,12 +78,6 @@ - android:key="customizable_lock_screen_quick_affordances" - android:title="@string/lockscreen_quick_affordances_title" - settings:controller="com.android.settings.display.CustomizableLockScreenQuickAffordancesPreferenceController" /> -- -- - - - -Date: Thu, 28 Oct 2021 02:30:59 +0000 -Subject: [PATCH 1/2] Trebuchet: Make overview scrim transparent again - -Also revert texts/buttons to workspace color - -Change-Id: I78c84865eb06b8e59c9c271cd2e267ae4cd7cc08 ---- - quickstep/res/values/styles.xml | 2 +- - quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +- - res/color-v31/overview_scrim.xml | 2 +- - res/color-v31/overview_scrim_dark.xml | 2 +- - res/color/overview_button.xml | 6 +++--- - 5 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml -index 8eea37f6c2..623f60f81a 100644 ---- a/quickstep/res/values/styles.xml -+++ b/quickstep/res/values/styles.xml -@@ -176,7 +176,7 @@ - parent="@android:style/Widget.DeviceDefault.Button.Borderless"> - @color/overview_button - @color/overview_button -- ?android:attr/textColorPrimary -+ ?attr/workspaceTextColor - 8dp - false - -diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java -index 9222e456e5..678c0dfd80 100644 ---- a/quickstep/src/com/android/quickstep/views/RecentsView.java -+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java -@@ -783,7 +783,7 @@ public abstract class RecentsView - -- -+ - -diff --git a/res/color-v31/overview_scrim_dark.xml b/res/color-v31/overview_scrim_dark.xml -index 2ab8ecdec9..894997c59a 100644 ---- a/res/color-v31/overview_scrim_dark.xml -+++ b/res/color-v31/overview_scrim_dark.xml -@@ -14,5 +14,5 @@ - limitations under the License. - --> - -- -+ - -diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml -index aa48b78604..e638ac2d4a 100644 ---- a/res/color/overview_button.xml -+++ b/res/color/overview_button.xml -@@ -2,10 +2,10 @@ - - - -- -\ No newline at end of file -+ --- -2.34.1 - diff --git a/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch b/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch deleted file mode 100644 index 14a501e..0000000 --- a/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch +++ /dev/null @@ -1,82 +0,0 @@ -From c04fae6b45b624a39d684c4b6cf02440a3fe83b5 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Fri, 18 Mar 2022 08:42:18 +0000 -Subject: [PATCH 2/2] Trebuchet: Kill haptics in recents - -This partially reverts commit cc5c8843dfebfa92057b6ce8904ac58cd05ffaef. - -Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153 ---- - .../NoButtonQuickSwitchTouchController.java | 8 -------- - .../TaskViewTouchController.java | 5 ----- - .../android/quickstep/views/RecentsView.java | 19 ------------------- - 3 files changed, 32 deletions(-) - -diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java -index 847114a960..eef4be2964 100644 ---- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java -+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java -@@ -419,14 +419,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController, - nonOverviewAnim.setFloatValues(startProgress, endProgress); - mNonOverviewAnim.dispatchOnStart(); - } -- if (targetState == QUICK_SWITCH_FROM_HOME) { -- // Navigating to quick switch, add scroll feedback since the first time is not -- // considered a scroll by the RecentsView. -- VibratorWrapper.INSTANCE.get(mLauncher).vibrate( -- RecentsView.SCROLL_VIBRATION_PRIMITIVE, -- RecentsView.SCROLL_VIBRATION_PRIMITIVE_SCALE, -- RecentsView.SCROLL_VIBRATION_FALLBACK); -- } - - nonOverviewAnim.setDuration(Math.max(xDuration, yDuration)); - mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState)); -diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java -index eddc50c64f..09f253b08d 100644 ---- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java -+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java -@@ -369,11 +369,6 @@ public abstract class TaskViewTouchController - mCurrentAnimation.startWithVelocity(mActivity, goingToEnd, - velocity * orientationHandler.getSecondaryTranslationDirectionFactor(), - mEndDisplacement, animationDuration); -- if (goingUp && goingToEnd && !mIsDismissHapticRunning) { -- VibratorWrapper.INSTANCE.get(mActivity).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE, -- TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE, TASK_DISMISS_VIBRATION_FALLBACK); -- mIsDismissHapticRunning = true; -- } - } - - private void clearState() { -diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java -index 678c0dfd80..8e75a7c18d 100644 ---- a/quickstep/src/com/android/quickstep/views/RecentsView.java -+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java -@@ -1466,25 +1466,6 @@ public abstract class RecentsView mScrollHapticMinGapMillis) { -- mScrollLastHapticTimestamp = now; -- VibratorWrapper.INSTANCE.get(mContext).vibrate(SCROLL_VIBRATION_PRIMITIVE, -- SCROLL_VIBRATION_PRIMITIVE_SCALE, SCROLL_VIBRATION_FALLBACK); -- } -- } -- - @Override - protected void determineScrollingStart(MotionEvent ev, float touchSlopScale) { - // Enables swiping to the left or right only if the task overlay is not modal. --- -2.34.1 - diff --git a/patches_platform_personal/packages_modules_NetworkStack/0001-Replace-captive-portal-URLs-globally.patch b/patches_platform_personal/packages_modules_NetworkStack/0001-Replace-captive-portal-URLs-globally.patch deleted file mode 100644 index c7e4597..0000000 --- a/patches_platform_personal/packages_modules_NetworkStack/0001-Replace-captive-portal-URLs-globally.patch +++ /dev/null @@ -1,87 +0,0 @@ -From b09034c7e5f9bbc2d29c3f10452259956fcb9f46 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sat, 16 Oct 2021 00:33:15 +0000 -Subject: [PATCH] Replace captive portal URLs globally - -...so that it works even without a SIM inserted, which is a typical usecase of mine -URLs from Chinese OEM UIs are faster and more reliable than g.cn and other int'l ones - -Change-Id: Ic3e124b2b62838a2bcf1dad0d670515f3d056964 ---- - res/values-mcc460/config.xml | 31 ------------------------------- - res/values/config.xml | 7 +++---- - 2 files changed, 3 insertions(+), 35 deletions(-) - delete mode 100644 res/values-mcc460/config.xml - -diff --git a/res/values-mcc460/config.xml b/res/values-mcc460/config.xml -deleted file mode 100644 -index 3c4b4933..00000000 ---- a/res/values-mcc460/config.xml -+++ /dev/null -@@ -1,31 +0,0 @@ -- -- -- -- -- http://connectivitycheck.gstatic.cn/generate_204 -- -- https://connectivitycheck.gstatic.cn/generate_204 -- -- -- http://www.googleapis.cn/generate_204 -- -- -diff --git a/res/values/config.xml b/res/values/config.xml -index 805ca041..61297dda 100644 ---- a/res/values/config.xml -+++ b/res/values/config.xml -@@ -13,7 +13,7 @@ - config_captive_portal_http_url and *NOT* by changing or overlaying - this resource. It will break if the enforcement of overlayable starts. - --> -- http://connectivitycheck.gstatic.com/generate_204 -+ http://conn4.coloros.com/generate204 - - -- https://www.google.com/generate_204 -+ https://conn4.coloros.com/generate204 - - - - -- http://www.google.com/gen_204 -- http://play.googleapis.com/generate_204 -+ http://connect.rom.miui.com/generate_204 - - --- -2.25.1 - diff --git a/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch b/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch deleted file mode 100644 index a8864f5..0000000 --- a/patches_platform_personal/vendor_lineage/0001-build-Integrate-prop-modifications-2-2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 863e8f70e3a4f987938ff4ad01c22822bc38e409 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sun, 20 Jun 2021 09:09:15 +0000 -Subject: [PATCH 1/5] build: Integrate prop modifications (2/2) - -Change-Id: I076973f902ab20011964e50955e4326c18d5b34e ---- - build/core/main_version.mk | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/build/core/main_version.mk b/build/core/main_version.mk -index 28044e2c..c5aa9617 100644 ---- a/build/core/main_version.mk -+++ b/build/core/main_version.mk -@@ -5,17 +5,12 @@ ADDITIONAL_SYSTEM_PROPERTIES += \ - endif - - # LineageOS System Version -+# Do not set Display Versions here, due to Makefile not playing nice with spaces - ADDITIONAL_SYSTEM_PROPERTIES += \ -- ro.lineage.version=$(LINEAGE_VERSION) \ - ro.lineage.releasetype=$(LINEAGE_BUILDTYPE) \ - ro.lineage.build.version=$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR) \ -- ro.modversion=$(LINEAGE_VERSION) \ - ro.lineagelegal.url=https://lineageos.org/legal - --# LineageOS Platform Display Version --ADDITIONAL_SYSTEM_PROPERTIES += \ -- ro.lineage.display.version=$(LINEAGE_DISPLAY_VERSION) -- - # LineageOS Platform SDK Version - ADDITIONAL_SYSTEM_PROPERTIES += \ - ro.lineage.build.version.plat.sdk=$(LINEAGE_PLATFORM_SDK_VERSION) --- -2.34.1 - diff --git a/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch b/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch deleted file mode 100644 index af9f8d2..0000000 --- a/patches_platform_personal/vendor_lineage/0002-build-Remove-Stk-2-2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 34f8aa093286970f82014f1dae0e86e4cbeba896 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sat, 16 Oct 2021 00:41:07 +0000 -Subject: [PATCH 2/5] build: Remove Stk (2/2) - -Change-Id: I4e1cfacd296e47ef1731f3c32555089a5fca6f0c ---- - config/data_only.mk | 4 ---- - config/telephony.mk | 3 +-- - 2 files changed, 1 insertion(+), 6 deletions(-) - -diff --git a/config/data_only.mk b/config/data_only.mk -index 5ff877c9..ab70301b 100644 ---- a/config/data_only.mk -+++ b/config/data_only.mk -@@ -1,7 +1,3 @@ - # World APN list - PRODUCT_PACKAGES += \ - apns-conf.xml -- --# Telephony packages --PRODUCT_PACKAGES += \ -- Stk -diff --git a/config/telephony.mk b/config/telephony.mk -index 6adf48d9..e63b320d 100644 ---- a/config/telephony.mk -+++ b/config/telephony.mk -@@ -8,8 +8,7 @@ PRODUCT_PACKAGES += \ - - # Telephony packages - PRODUCT_PACKAGES += \ -- messaging \ -- Stk -+ messaging - - # Default ringtone - PRODUCT_PRODUCT_PROPERTIES += \ --- -2.34.1 - diff --git a/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch b/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch deleted file mode 100644 index 496248a..0000000 --- a/patches_platform_personal/vendor_lineage/0003-vendor_lineage-Ignore-neverallows.-again.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 84b5b23519166701423a324cac955e9110e36eae Mon Sep 17 00:00:00 2001 -From: AndyCGYan -Date: Mon, 1 Jul 2019 07:03:04 +0000 -Subject: [PATCH 3/5] vendor_lineage: Ignore neverallows... again - -Because unofficial builds are better than no builds! - -Change-Id: I4b19d09b28f79c6f5020bf03fdf8931145bca03a ---- - build/core/config.mk | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/build/core/config.mk b/build/core/config.mk -index f2e595ff..d6d036a9 100644 ---- a/build/core/config.mk -+++ b/build/core/config.mk -@@ -20,5 +20,10 @@ FRAMEWORK_LINEAGE_PLATFORM_API_FILE := $(TOPDIR)lineage-sdk/api/lineage_current. - FRAMEWORK_LINEAGE_PLATFORM_REMOVED_API_FILE := $(TOPDIR)lineage-sdk/api/lineage_removed.txt - FRAMEWORK_LINEAGE_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/lineage/build/core/apicheck_msg_current.txt - -+# We modify several neverallows, so let the build proceed -+ifneq ($(TARGET_BUILD_VARIANT),user) -+SELINUX_IGNORE_NEVERALLOWS := true -+endif -+ - # Rules for QCOM targets - include $(TOPDIR)vendor/lineage/build/core/qcom_target.mk --- -2.34.1 - diff --git a/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch b/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch deleted file mode 100644 index a95d7a9..0000000 --- a/patches_platform_personal/vendor_lineage/0004-vendor_lineage-Personal-theme-as-SRO.patch +++ /dev/null @@ -1,2242 +0,0 @@ -From 05700475543c1dece33a8f49bcb84d5b709a3164 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sat, 9 Apr 2022 02:48:55 +0000 -Subject: [PATCH 4/5] vendor_lineage: Personal theme as SRO - -Last revised on 2023/02/11 - -... - -I look forward to what LOS will look like in the future, when everything's ready - -Change-Id: I43164b7a4145616d162c6b4b4b84d1953cb483cc ---- - config/common.mk | 7 +- - .../res/drawable/ic_launcher_background.xml | 24 ++++ - .../res/drawable/ic_launcher_foreground.xml | 33 +++++ - .../res/drawable/ic_launcher_background.xml | 24 ++++ - .../res/drawable/ic_launcher_foreground.xml | 39 ++++++ - .../res/drawable/ic_launcher_background.xml | 24 ++++ - .../res/drawable/ic_launcher_foreground.xml | 33 +++++ - .../res/drawable/ic_launcher_background.xml | 14 +++ - .../res/drawable/ic_launcher_foreground.xml | 33 +++++ - .../res/drawable/ic_launcher_background.xml | 20 +++ - .../res/drawable/ic_launcher_foreground.xml | 36 ++++++ - .../res/drawable/ic_launcher_background.xml | 23 ++++ - .../res/drawable/ic_launcher_foreground.xml | 39 ++++++ - .../res/mipmap-anydpi/launcher_clock.xml | 116 ++++++++++++++++++ - .../apps/DeskClock/res/values/colors.xml | 8 ++ - .../res/drawable/ic_launcher_background.xml | 14 +++ - .../res/drawable/ic_launcher_foreground.xml | 41 +++++++ - .../res/drawable/ic_launcher_background.xml | 17 +++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++ - .../res/drawable/ic_launcher_background.xml | 22 ++++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++ - .../res/drawable/ic_launcher_background.xml | 14 +++ - .../res/drawable/ic_launcher_foreground.xml | 40 ++++++ - .../res/drawable/logo_calendar_dyn_day_01.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_02.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_03.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_04.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_05.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_06.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_07.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_08.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_09.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_10.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_11.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_12.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_13.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_14.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_15.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_16.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_17.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_18.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_19.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_20.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_21.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_22.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_23.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_24.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_25.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_26.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_27.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_28.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_29.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_30.xml | 15 +++ - .../res/drawable/logo_calendar_dyn_day_31.xml | 15 +++ - .../res/drawable/logo_calendar_midlayer.xml | 17 +++ - .../res/drawable/ic_launcher_background.xml | 14 +++ - .../res/drawable/ic_launcher_foreground.xml | 60 +++++++++ - .../res/drawable/ic_launcher_background.xml | 24 ++++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++ - .../res/drawable/ic_launcher_background.xml | 17 +++ - .../res/drawable/ic_launcher_foreground.xml | 33 +++++ - .../res/drawable/ic_launcher_background.xml | 18 +++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++ - .../apps/Messaging/res/values/colors.xml | 7 ++ - .../Messaging/res/values/lineage_colors.xml | 4 + - .../res/drawable/ic_launcher_background.xml | 23 ++++ - .../res/drawable/ic_launcher_foreground.xml | 33 +++++ - .../res/drawable/ic_launcher_background.xml | 18 +++ - .../res/drawable/ic_launcher_foreground.xml | 33 +++++ - .../res/drawable/ic_launcher_background.xml | 23 ++++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++ - .../res/drawable/ic_launcher_background.xml | 20 +++ - .../res/drawable/ic_launcher_foreground.xml | 34 +++++ - 73 files changed, 1632 insertions(+), 2 deletions(-) - create mode 100644 overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/DeskClock/res/mipmap-anydpi/launcher_clock.xml - create mode 100644 overlay/personal/packages/apps/DeskClock/res/values/colors.xml - create mode 100644 overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_01.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_02.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_03.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_04.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_05.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_06.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_07.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_08.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_09.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_10.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_11.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_12.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_13.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_14.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_15.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_16.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_17.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_18.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_19.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_20.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_21.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_22.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_23.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_24.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_25.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_26.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_27.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_28.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_29.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_30.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_31.xml - create mode 100644 overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_midlayer.xml - create mode 100644 overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Messaging/res/values/colors.xml - create mode 100644 overlay/personal/packages/apps/Messaging/res/values/lineage_colors.xml - create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_foreground.xml - create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_background.xml - create mode 100644 overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml - -diff --git a/config/common.mk b/config/common.mk -index 70e0cbaf..4da11943 100644 ---- a/config/common.mk -+++ b/config/common.mk -@@ -189,10 +189,13 @@ PRODUCT_DEXPREOPT_SPEED_APPS += \ - PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - dalvik.vm.systemuicompilerfilter=speed - --PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/no-rro -+PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \ -+ vendor/lineage/overlay/no-rro \ -+ vendor/lineage/overlay/personal - PRODUCT_PACKAGE_OVERLAYS += \ - vendor/lineage/overlay/common \ -- vendor/lineage/overlay/no-rro -+ vendor/lineage/overlay/no-rro \ -+ vendor/lineage/overlay/personal - - PRODUCT_PACKAGES += \ - DocumentsUIOverlay \ -diff --git a/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..db946c4e ---- /dev/null -+++ b/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,24 @@ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..ca215f97 ---- /dev/null -+++ b/overlay/personal/packages/apps/Aperture/app/src/main/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,33 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..9a30966d ---- /dev/null -+++ b/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,24 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..64ffa3df ---- /dev/null -+++ b/overlay/personal/packages/apps/AudioFX/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,39 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..db946c4e ---- /dev/null -+++ b/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,24 @@ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..ca215f97 ---- /dev/null -+++ b/overlay/personal/packages/apps/Camera2/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,33 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..65b0e2db ---- /dev/null -+++ b/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,14 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..ae31cbef ---- /dev/null -+++ b/overlay/personal/packages/apps/CellBroadcastReceiver/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,33 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..00262be1 ---- /dev/null -+++ b/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,20 @@ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..2a374437 ---- /dev/null -+++ b/overlay/personal/packages/apps/Contacts/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,36 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..fb1b75c1 ---- /dev/null -+++ b/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,23 @@ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..f54da6b5 ---- /dev/null -+++ b/overlay/personal/packages/apps/DeskClock/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,39 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/DeskClock/res/mipmap-anydpi/launcher_clock.xml b/overlay/personal/packages/apps/DeskClock/res/mipmap-anydpi/launcher_clock.xml -new file mode 100644 -index 00000000..b353eae3 ---- /dev/null -+++ b/overlay/personal/packages/apps/DeskClock/res/mipmap-anydpi/launcher_clock.xml -@@ -0,0 +1,116 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/DeskClock/res/values/colors.xml b/overlay/personal/packages/apps/DeskClock/res/values/colors.xml -new file mode 100644 -index 00000000..f147a9d1 ---- /dev/null -+++ b/overlay/personal/packages/apps/DeskClock/res/values/colors.xml -@@ -0,0 +1,8 @@ -+ -+ -+ @android:color/system_accent1_200 -+ @android:color/system_accent1_100 -+ @android:color/system_accent1_200 -+ @android:color/system_accent1_600 -+ @android:color/system_accent1_900 -+ -diff --git a/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..65b0e2db ---- /dev/null -+++ b/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,14 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..a6847e2c ---- /dev/null -+++ b/overlay/personal/packages/apps/Dialer/java/com/android/dialer/app/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,41 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..4f313e32 ---- /dev/null -+++ b/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,17 @@ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..6d88a93d ---- /dev/null -+++ b/overlay/personal/packages/apps/DocumentsUI/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,34 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..f969cf68 ---- /dev/null -+++ b/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,22 @@ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..b2e98016 ---- /dev/null -+++ b/overlay/personal/packages/apps/Eleven/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,34 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..65b0e2db ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,14 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..18756857 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,40 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_01.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_01.xml -new file mode 100644 -index 00000000..912b3810 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_01.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_02.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_02.xml -new file mode 100644 -index 00000000..adf71480 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_02.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_03.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_03.xml -new file mode 100644 -index 00000000..c4d7cda0 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_03.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_04.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_04.xml -new file mode 100644 -index 00000000..1e9583e1 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_04.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_05.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_05.xml -new file mode 100644 -index 00000000..eee804b2 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_05.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_06.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_06.xml -new file mode 100644 -index 00000000..2596f406 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_06.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_07.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_07.xml -new file mode 100644 -index 00000000..ed1c7508 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_07.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_08.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_08.xml -new file mode 100644 -index 00000000..4066e2e9 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_08.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_09.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_09.xml -new file mode 100644 -index 00000000..dc479d24 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_09.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_10.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_10.xml -new file mode 100644 -index 00000000..bc783a67 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_10.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_11.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_11.xml -new file mode 100644 -index 00000000..f37c0768 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_11.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_12.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_12.xml -new file mode 100644 -index 00000000..466b69ed ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_12.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_13.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_13.xml -new file mode 100644 -index 00000000..2f16f68d ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_13.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_14.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_14.xml -new file mode 100644 -index 00000000..fb1e67a5 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_14.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_15.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_15.xml -new file mode 100644 -index 00000000..daa1fb5c ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_15.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_16.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_16.xml -new file mode 100644 -index 00000000..93c7dd1c ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_16.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_17.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_17.xml -new file mode 100644 -index 00000000..af507ab8 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_17.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_18.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_18.xml -new file mode 100644 -index 00000000..6afb61ef ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_18.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_19.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_19.xml -new file mode 100644 -index 00000000..c85da438 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_19.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_20.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_20.xml -new file mode 100644 -index 00000000..60e5a2e8 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_20.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_21.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_21.xml -new file mode 100644 -index 00000000..1298bccd ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_21.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_22.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_22.xml -new file mode 100644 -index 00000000..09d5574f ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_22.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_23.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_23.xml -new file mode 100644 -index 00000000..ee65e25a ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_23.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_24.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_24.xml -new file mode 100644 -index 00000000..3567ccc2 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_24.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_25.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_25.xml -new file mode 100644 -index 00000000..88c64ea2 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_25.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_26.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_26.xml -new file mode 100644 -index 00000000..a9bb39b5 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_26.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_27.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_27.xml -new file mode 100644 -index 00000000..a648a673 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_27.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_28.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_28.xml -new file mode 100644 -index 00000000..86fdba68 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_28.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_29.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_29.xml -new file mode 100644 -index 00000000..cd4d9a7e ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_29.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_30.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_30.xml -new file mode 100644 -index 00000000..8cc3bbcb ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_30.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_31.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_31.xml -new file mode 100644 -index 00000000..5d62c419 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_dyn_day_31.xml -@@ -0,0 +1,15 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_midlayer.xml b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_midlayer.xml -new file mode 100644 -index 00000000..ae694d29 ---- /dev/null -+++ b/overlay/personal/packages/apps/Etar/app/src/main/res/drawable/logo_calendar_midlayer.xml -@@ -0,0 +1,17 @@ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..65b0e2db ---- /dev/null -+++ b/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,14 @@ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..faf2caf4 ---- /dev/null -+++ b/overlay/personal/packages/apps/ExactCalculator/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,60 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..32abe0b8 ---- /dev/null -+++ b/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,24 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..03b51d0c ---- /dev/null -+++ b/overlay/personal/packages/apps/Gallery2/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,34 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..bf75b615 ---- /dev/null -+++ b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,17 @@ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..7f152b9c ---- /dev/null -+++ b/overlay/personal/packages/apps/Jelly/app/src/main/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,33 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..b9256675 ---- /dev/null -+++ b/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..ab598892 ---- /dev/null -+++ b/overlay/personal/packages/apps/Messaging/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,34 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Messaging/res/values/colors.xml b/overlay/personal/packages/apps/Messaging/res/values/colors.xml -new file mode 100644 -index 00000000..6e1ef338 ---- /dev/null -+++ b/overlay/personal/packages/apps/Messaging/res/values/colors.xml -@@ -0,0 +1,7 @@ -+ -+ -+ #2A56C6 -+ #1C3AA9 -+ #802A56C6 -+ #802A56C6 -+ -diff --git a/overlay/personal/packages/apps/Messaging/res/values/lineage_colors.xml b/overlay/personal/packages/apps/Messaging/res/values/lineage_colors.xml -new file mode 100644 -index 00000000..7b407a1c ---- /dev/null -+++ b/overlay/personal/packages/apps/Messaging/res/values/lineage_colors.xml -@@ -0,0 +1,4 @@ -+ -+ -+ #F50057 -+ -diff --git a/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..afc988fc ---- /dev/null -+++ b/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,23 @@ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..1a699688 ---- /dev/null -+++ b/overlay/personal/packages/apps/Recorder/app/src/main/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,33 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..19d7e4f0 ---- /dev/null -+++ b/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,18 @@ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..8cd7953c ---- /dev/null -+++ b/overlay/personal/packages/apps/Settings/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,33 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..791bba6b ---- /dev/null -+++ b/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,23 @@ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..138b559b ---- /dev/null -+++ b/overlay/personal/packages/apps/Trebuchet/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,34 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_background.xml b/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_background.xml -new file mode 100644 -index 00000000..b70d3060 ---- /dev/null -+++ b/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_background.xml -@@ -0,0 +1,20 @@ -+ -+ -+ -+ -+ -+ -+ -diff --git a/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml b/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml -new file mode 100644 -index 00000000..4e86fe3d ---- /dev/null -+++ b/overlay/personal/packages/inputmethods/LatinIME/java/res/drawable/ic_launcher_foreground.xml -@@ -0,0 +1,34 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ --- -2.34.1 - diff --git a/patches_platform_personal/vendor_lineage/0005-cats22flip-apn-ims.patch b/patches_platform_personal/vendor_lineage/0005-cats22flip-apn-ims.patch deleted file mode 100644 index a375cab..0000000 --- a/patches_platform_personal/vendor_lineage/0005-cats22flip-apn-ims.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9218670153d5aa40fd05f51d89240fc7859293a2 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Mon, 14 Mar 2022 03:44:59 +0000 -Subject: [PATCH 5/5] Fix APN on CatS22Flip - -This reverts commit I2833bc1764a311eef7ebc170cfa1e25cbefb3737. - -Change-Id: I036bdd576e536392cf41e3c536d5ca2eb04e5a02 ---- - .../prebuild/common/etc/apns-conf.xml | 1 -------- - 1 file changed, 1 insertion(-) - -diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml -index a7c9e2d8..81716d39 100644 ---- a/prebuilt/common/etc/apns-conf.xml -+++ b/prebuilt/common/etc/apns-conf.xml -@@ -22,6 +22,7 @@ - - - -+ - - - diff --git a/patches_treble_personal/device_phh_treble/0002-Revert-Include-sim-toolkit-app.patch b/patches_treble_personal/device_phh_treble/0002-Revert-Include-sim-toolkit-app.patch deleted file mode 100644 index b617bb7..0000000 --- a/patches_treble_personal/device_phh_treble/0002-Revert-Include-sim-toolkit-app.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cfc2fd859fb445535d9de131697c56f21d1cee48 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Thu, 28 Oct 2021 01:51:27 +0000 -Subject: [PATCH 2/3] Revert "Include sim toolkit app" - -This reverts commit 52d4d731465f37e3e8ccf9d315cfc8195303e51f. - -Change-Id: I1eb7f4bb070eea649b4cea6280299e629d1edb3d ---- - base.mk | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/base.mk b/base.mk -index 3a99248..877a408 100644 ---- a/base.mk -+++ b/base.mk -@@ -172,9 +172,6 @@ PRODUCT_PACKAGES += \ - xiaomi-motor \ - oneplus-motor - --PRODUCT_PACKAGES += \ -- Stk -- - PRODUCT_PACKAGES += \ - resetprop_phh - --- -2.34.1 - diff --git a/patches_treble_personal/device_phh_treble/0003-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch b/patches_treble_personal/device_phh_treble/0003-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch deleted file mode 100644 index e37d9d9..0000000 --- a/patches_treble_personal/device_phh_treble/0003-Revert-treble-Set-BOARD_EXT4_SHARE_DUP_BLOCKS-explic.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 719b8e8406f6dbb72aac8029c37cdef445339292 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Sun, 8 Aug 2021 09:31:01 +0000 -Subject: [PATCH 3/3] Revert "treble: Set BOARD_EXT4_SHARE_DUP_BLOCKS - explicitly" - -This reverts commit d7b179f234d76c3acf7a723fc05f07efe9adc84c. - -Change-Id: I2bf95d40d4a096181710765c7d152f63556d27d8 ---- - board-base.mk | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/board-base.mk b/board-base.mk -index 9d1d45e..8cde64f 100644 ---- a/board-base.mk -+++ b/board-base.mk -@@ -11,6 +11,4 @@ BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true - - BOARD_ROOT_EXTRA_SYMLINKS := $(filter-out $(BOARD_ROOT_EXTRA_SYMLINKS),/mnt/vendor/persist:/persist) - --BOARD_EXT4_SHARE_DUP_BLOCKS := true -- - TARGET_NO_KERNEL_OVERRIDE := true --- -2.34.1 -