diff --git a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch index 20298ac..d69332c 100644 --- a/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch +++ b/patches_platform_personal/packages_apps_DeskClock/0001-DeskClock-Remove-night-mode.patch @@ -1,4 +1,4 @@ -From 3ae6c0a36285aee1b18aca199593c828d9d6d2ec Mon Sep 17 00:00:00 2001 +From 2e7478c72aa7c3b6585ec64bd61d9df6366e1c48 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 5 Sep 2021 00:30:33 +0000 Subject: [PATCH 1/3] DeskClock: Remove night mode diff --git a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch index 5f553b6..6f023ad 100644 --- a/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch +++ b/patches_platform_personal/packages_apps_DeskClock/0002-DeskClock-Adapt-digital-clocks-to-S-style.patch @@ -1,4 +1,4 @@ -From fe60811c629e1e8376955463f4f0dafc5b832056 Mon Sep 17 00:00:00 2001 +From e72a06f095a0363085f32d631597611b96e6c160 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 19 Jan 2022 18:04:36 +0000 Subject: [PATCH 2/3] DeskClock: Adapt digital clocks to S style @@ -475,10 +475,10 @@ index 7ae54c97c..73a800383 100644 + diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -index e31f2d801..a93766697 100644 +index 1005f0ac0..e97bb474a 100644 --- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java +++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -@@ -212,7 +212,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -224,7 +224,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); @@ -487,7 +487,7 @@ index e31f2d801..a93766697 100644 } // Configure child views of the remote view. -@@ -244,7 +244,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -256,7 +256,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { final int targetWidthPx = portrait ? minWidthPx : maxWidthPx; final int targetHeightPx = portrait ? maxHeightPx : minHeightPx; final int largestClockFontSizePx = @@ -496,7 +496,7 @@ index e31f2d801..a93766697 100644 // Create a size template that describes the widget bounds. final Sizes template = new Sizes(targetWidthPx, targetHeightPx, largestClockFontSizePx); -@@ -316,13 +316,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -328,13 +328,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { } // Measure the widget at the largest possible size. @@ -512,7 +512,7 @@ index e31f2d801..a93766697 100644 if (low.hasViolations()) { return low; } -@@ -334,7 +334,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -346,7 +346,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { return low; } @@ -521,7 +521,7 @@ index e31f2d801..a93766697 100644 if (midSize.hasViolations()) { high = midSize; } else { -@@ -397,7 +397,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -409,7 +409,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { * the offscreen {@code sizer} view. Measure the {@code sizer} view and return the resulting * size measurements. */ @@ -530,7 +530,7 @@ index e31f2d801..a93766697 100644 // Create a copy of the given template sizes. final Sizes measuredSizes = template.newSize(); -@@ -408,13 +408,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -420,13 +420,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { final TextView nextAlarmIcon = (TextView) sizer.findViewById(R.id.nextAlarmIcon); // Adjust the font sizes. @@ -546,7 +546,7 @@ index e31f2d801..a93766697 100644 // Measure and layout the sizer. final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx); -@@ -495,12 +495,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -507,12 +507,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { private int getLargestClockFontSizePx() { return mLargestClockFontSizePx; } private int getSmallestClockFontSizePx() { return mSmallestClockFontSizePx; } private int getClockFontSizePx() { return mClockFontSizePx; } diff --git a/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch b/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch index 39cf6d0..b7a5314 100644 --- a/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch +++ b/patches_platform_personal/packages_apps_DeskClock/0003-DeskClock-Wallpaper-based-text-coloring-for-digital-.patch @@ -1,4 +1,4 @@ -From dffc4d40020757da96c73e62a78ce94d6277feba Mon Sep 17 00:00:00 2001 +From 87509b89725d9b7439e4c14a19175a085e10b784 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 20 Jan 2022 04:42:03 +0000 Subject: [PATCH 3/3] DeskClock: Wallpaper-based text coloring for digital @@ -12,7 +12,7 @@ Change-Id: Ie22c4980526575f73ebb4e56780d4c2193cc45d3 1 file changed, 57 insertions(+) diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java -index a93766697..de56f09ca 100644 +index e97bb474a..d52693a1b 100644 --- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java +++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java @@ -19,6 +19,8 @@ package com.android.alarmclock; @@ -23,8 +23,8 @@ index a93766697..de56f09ca 100644 +import android.app.WallpaperManager; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; - import android.content.ComponentName; -@@ -109,12 +111,40 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + import android.content.BroadcastReceiver; +@@ -112,12 +114,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); @@ -65,7 +65,7 @@ index a93766697..de56f09ca 100644 } @Override -@@ -204,6 +234,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -216,6 +246,19 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { */ private static RemoteViews relayoutWidget(Context context, AppWidgetManager wm, int widgetId, Bundle options, boolean portrait) { @@ -85,7 +85,7 @@ index a93766697..de56f09ca 100644 // Create a remote view for the digital clock. final String packageName = context.getPackageName(); final RemoteViews rv = new RemoteViews(packageName, R.layout.digital_widget); -@@ -261,6 +304,17 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -273,6 +316,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); @@ -103,7 +103,7 @@ index a93766697..de56f09ca 100644 final int smallestWorldCityListSizePx = resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size); if (sizes.getListHeight() <= smallestWorldCityListSizePx) { -@@ -416,6 +470,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { +@@ -428,6 +482,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx); nextAlarmIcon.setPadding(0, 0, measuredSizes.mIconPaddingPx, 0);