diff --git a/patches_platform_personal/packages_apps_DeskClock/0001-Revert-DeskClock-Digital-widget-Redesign.patch b/patches_platform_personal/packages_apps_DeskClock/0001-Revert-DeskClock-Digital-widget-Redesign.patch new file mode 100644 index 0000000..753a9a6 --- /dev/null +++ b/patches_platform_personal/packages_apps_DeskClock/0001-Revert-DeskClock-Digital-widget-Redesign.patch @@ -0,0 +1,1628 @@ +From adca43973d7b231ae382a717f3da794f4c107370 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 7 May 2023 14:24:31 +0000 +Subject: [PATCH 1/5] Revert "DeskClock: Digital widget: Redesign" + +This reverts commit d65b3b60d58e31ee63307a539c8c5394bdbb76e7. +--- + AndroidManifest.xml | 11 +- + res/drawable/widget_background.xml | 11 -- + .../widget_configuration_background.xml | 14 -- + res/layout-night/digital_widget_preview.xml | 59 ------- + res/layout/digital_widget.xml | 53 ++---- + 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 | 35 ++-- + res/layout/world_clock_remote_list_item.xml | 45 +++-- + res/values-night/styles.xml | 15 -- + res/values-sw600dp/dimens.xml | 8 +- + res/values/attrs.xml | 13 -- + res/values/cm_strings.xml | 7 - + res/values/colors.xml | 8 - + res/values/dimens.xml | 17 +- + res/values/donottranslate.xml | 6 +- + res/values/styles.xml | 161 +++--------------- + 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/Utils.java | 2 +- + 30 files changed, 111 insertions(+), 857 deletions(-) + 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 + 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 + 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/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/digital_widget.xml b/res/layout/digital_widget.xml +index 3dfed7f84..d09cba64c 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..be7677ba7 100644 +--- a/res/layout/digital_widget_sizer.xml ++++ b/res/layout/digital_widget_sizer.xml +@@ -1,6 +1,5 @@ + + + ++ android:orientation="vertical"> + + ++ android:singleLine="true" /> + + ++ 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 @@ + + +- +- +- +diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml +index 27895968d..bde6b225c 100644 +--- a/res/values-sw600dp/dimens.xml ++++ b/res/values-sw600dp/dimens.xml +@@ -54,11 +54,11 @@ + 170dp + + +- 130dp +- 80dp ++ 300dp ++ 170dp + 15dp +- 48sp +- 56sp ++ 52sp ++ 65sp + + + 20dp +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/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 853559f1c..91ca13873 100644 +--- a/res/values/colors.xml ++++ b/res/values/colors.xml +@@ -70,12 +70,4 @@ + @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 fde225b75..c26d93ddd 100644 +--- a/res/values/dimens.xml ++++ b/res/values/dimens.xml +@@ -86,11 +86,11 @@ + 110dp + + +- 202dp +- 80dp ++ 206dp ++ 129dp + 10dp +- 24sp +- 36sp ++ 32sp ++ 40sp + + + 10dp +@@ -98,6 +98,11 @@ + 80dp + 80dp + ++ ++ 2.75 ++ 2.0 ++ 2.0 ++ + + 1dp + +@@ -139,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/styles.xml b/res/values/styles.xml +index 98bd74f52..683df4ee5 100644 +--- a/res/values/styles.xml ++++ b/res/values/styles.xml +@@ -22,10 +22,27 @@ + @color/white_63p + + ++ ++ + + ++ ++ + + ++ ++ + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + +diff --git a/res/xml/digital_appwidget.xml b/res/xml/digital_appwidget.xml +index cb876da80..fe91ff643 100644 +--- a/res/xml/digital_appwidget.xml ++++ b/res/xml/digital_appwidget.xml +@@ -17,14 +17,11 @@ + ++ android:widgetCategory="keyguard|home_screen" /> +diff --git a/src/com/android/alarmclock/DigitalAppWidgetCityViewsFactory.java b/src/com/android/alarmclock/DigitalAppWidgetCityViewsFactory.java +index d50be4849..96c499bcc 100644 +--- a/src/com/android/alarmclock/DigitalAppWidgetCityViewsFactory.java ++++ b/src/com/android/alarmclock/DigitalAppWidgetCityViewsFactory.java +@@ -113,14 +113,8 @@ public class DigitalAppWidgetCityViewsFactory implements RemoteViewsFactory { + (leftIndex < mCities.size() ? mCities.get(leftIndex) : null); + final City right = rightIndex < mCities.size() ? mCities.get(rightIndex) : null; + +- String packageName = mContext.getPackageName(); +- int[] layoutIds = WidgetUtils.getWidgetLayouts(mContext, mWidgetId); +- final RemoteViews rv = new RemoteViews(packageName, layoutIds[0]); +- rv.setLightBackgroundLayoutId(layoutIds[1]); +- +- rv.removeAllViews(R.id.themed_root); +- rv.addView(R.id.themed_root, new RemoteViews(packageName, +- R.layout.world_clock_remote_list_item)); ++ final RemoteViews rv = ++ new RemoteViews(mContext.getPackageName(), R.layout.world_clock_remote_list_item); + + // Show the left clock if one exists. + if (left != null) { +diff --git a/src/com/android/alarmclock/DigitalAppWidgetConfigurationActivity.java b/src/com/android/alarmclock/DigitalAppWidgetConfigurationActivity.java +deleted file mode 100644 +index d65a9e9d9..000000000 +--- a/src/com/android/alarmclock/DigitalAppWidgetConfigurationActivity.java ++++ /dev/null +@@ -1,50 +0,0 @@ +-package com.android.alarmclock; +- +-import static android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID; +-import static android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID; +- +-import android.appwidget.AppWidgetManager; +-import android.content.Intent; +-import android.os.Bundle; +-import android.view.View; +- +-import androidx.annotation.Nullable; +-import androidx.appcompat.app.AppCompatActivity; +- +-import com.android.deskclock.R; +- +-public class DigitalAppWidgetConfigurationActivity extends AppCompatActivity { +- private int mAppWidgetId = INVALID_APPWIDGET_ID; +- +- @Override +- protected void onCreate(@Nullable Bundle savedInstanceState) { +- super.onCreate(savedInstanceState); +- +- setResult(RESULT_CANCELED); +- setContentView(R.layout.digital_widget_configuration); +- +- View transparent = findViewById(R.id.preview_transparent); +- transparent.setOnClickListener(v -> onWidgetContainerClicked(false)); +- View solid = findViewById(R.id.preview_solid); +- solid.setOnClickListener(v -> onWidgetContainerClicked(true)); +- +- Intent intent = getIntent(); +- if (intent != null) { +- Bundle extras = intent.getExtras(); +- if (extras != null) { +- mAppWidgetId = extras.getInt(EXTRA_APPWIDGET_ID, INVALID_APPWIDGET_ID); +- } +- } +- } +- +- private void onWidgetContainerClicked(boolean isSolid) { +- WidgetUtils.saveWidgetMode(this, mAppWidgetId, isSolid); +- AppWidgetManager wm = AppWidgetManager.getInstance(this); +- DigitalAppWidgetProvider.updateAppWidget(this, wm, mAppWidgetId); +- +- Intent result = new Intent(); +- result.putExtra(EXTRA_APPWIDGET_ID, mAppWidgetId); +- setResult(RESULT_OK, result); +- finish(); +- } +-} +diff --git a/src/com/android/alarmclock/DigitalAppWidgetProvider.java b/src/com/android/alarmclock/DigitalAppWidgetProvider.java +index ec6fac409..b54a500c5 100644 +--- a/src/com/android/alarmclock/DigitalAppWidgetProvider.java ++++ b/src/com/android/alarmclock/DigitalAppWidgetProvider.java +@@ -24,7 +24,6 @@ import static android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT; + import static android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH; + import static android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT; + import static android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH; +-import static android.content.Intent.ACTION_CONFIGURATION_CHANGED; + import static android.content.Intent.ACTION_LOCALE_CHANGED; + import static android.content.Intent.ACTION_TIMEZONE_CHANGED; + import static android.content.Intent.ACTION_TIME_CHANGED; +@@ -47,6 +46,7 @@ import android.content.Context; + import android.content.Intent; + import android.content.IntentFilter; + import android.content.res.Resources; ++import android.graphics.Bitmap; + import android.net.Uri; + import android.os.Bundle; + import android.text.TextUtils; +@@ -54,7 +54,6 @@ import android.text.format.DateFormat; + import android.util.ArraySet; + import android.view.LayoutInflater; + import android.view.View; +-import android.widget.LinearLayout; + import android.widget.RemoteViews; + import android.widget.TextClock; + import android.widget.TextView; +@@ -149,7 +148,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + case ACTION_TIMEZONE_CHANGED: + case ACTION_ON_DAY_CHANGE: + case ACTION_WORLD_CITIES_CHANGED: +- case ACTION_CONFIGURATION_CHANGED: + for (int widgetId : widgetIds) { + relayoutWidget(context, wm, widgetId, wm.getAppWidgetOptions(widgetId)); + } +@@ -182,7 +180,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + IntentFilter intentFilter = new IntentFilter(); + intentFilter.addAction(ACTION_WORLD_CITIES_CHANGED); + intentFilter.addAction(ACTION_ON_DAY_CHANGE); +- intentFilter.addAction(ACTION_CONFIGURATION_CHANGED); + context.getApplicationContext().registerReceiver(receiver, intentFilter); + + sReceiversRegistered = true; +@@ -213,10 +210,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + wm.notifyAppWidgetViewDataChanged(widgetId, R.id.world_city_list); + } + +- public static void updateAppWidget(Context context, AppWidgetManager wm, int widgetId) { +- relayoutWidget(context, wm, widgetId, wm.getAppWidgetOptions(widgetId)); +- } +- + /** + * Compute optimal font and icon sizes offscreen for the given orientation. + */ +@@ -224,18 +217,13 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + Bundle options, boolean portrait) { + // Create a remote view for the digital clock. + final String packageName = context.getPackageName(); +- int[] layoutIds = WidgetUtils.getWidgetLayouts(context, widgetId); +- final RemoteViews rv = new RemoteViews(packageName, layoutIds[0]); +- rv.setLightBackgroundLayoutId(layoutIds[1]); +- +- rv.removeAllViews(R.id.themed_root); +- rv.addView(R.id.themed_root, new RemoteViews(packageName, R.layout.digital_widget)); ++ final RemoteViews rv = new RemoteViews(packageName, R.layout.digital_widget); + + // Tapping on the widget opens the app (if not on the lock screen). + 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(android.R.id.background, pi); ++ rv.setOnClickPendingIntent(R.id.digital_widget, pi); + } + + // Configure child views of the remote view. +@@ -279,15 +267,10 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + } + + // Apply the computed sizes to the remote views. +- rv.setInt(R.id.nextAlarmIcon, "setMaxHeight", sizes.mFontSizePx); +- rv.setViewPadding(R.id.nextAlarmIcon, sizes.mIconPaddingPx, 0, sizes.mIconPaddingPx, 0); ++ rv.setImageViewBitmap(R.id.nextAlarmIcon, sizes.mIconBitmap); + rv.setTextViewTextSize(R.id.date, COMPLEX_UNIT_PX, sizes.mFontSizePx); + rv.setTextViewTextSize(R.id.nextAlarm, COMPLEX_UNIT_PX, sizes.mFontSizePx); + rv.setTextViewTextSize(R.id.clock, COMPLEX_UNIT_PX, sizes.mClockFontSizePx); +- // Shift the bottom view up by half of the non-removable TextView padding +- rv.setViewLayoutMargin(R.id.bottom_view, RemoteViews.MARGIN_TOP, +- sizes.mBottomViewMarginTopPx, COMPLEX_UNIT_PX); +- rv.setViewPadding(R.id.bottom_view, 0, 0, 0, sizes.mBottomViewPaddingBottomPx); + + final int smallestWorldCityListSizePx = + resources.getDimensionPixelSize(R.dimen.widget_min_world_city_list_size); +@@ -324,8 +307,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + @SuppressLint("InflateParams") + final View sizer = inflater.inflate(R.layout.digital_widget_sizer, null /* root */); + +- int padding = context.getResources().getDimensionPixelSize(R.dimen.widget_padding); +- sizer.findViewById(R.id.widget_item).setPadding(padding, padding, padding, padding); + // Configure the date to display the current date string. + final CharSequence dateFormat = getDateFormat(context); + final TextClock date = sizer.findViewById(R.id.date); +@@ -439,7 +420,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + final TextClock clock = sizer.findViewById(R.id.clock); + final TextView nextAlarm = sizer.findViewById(R.id.nextAlarm); + final TextView nextAlarmIcon = sizer.findViewById(R.id.nextAlarmIcon); +- final LinearLayout bottomView = sizer.findViewById(R.id.bottom_view); + + // Adjust the font sizes. + measuredSizes.setClockFontSizePx(clockFontSize); +@@ -449,17 +429,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + nextAlarm.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mFontSizePx); + nextAlarmIcon.setTextSize(COMPLEX_UNIT_PX, measuredSizes.mIconFontSizePx); + nextAlarmIcon.setPadding(measuredSizes.mIconPaddingPx, 0, measuredSizes.mIconPaddingPx, 0); +- // We want to shift the date line up by half the invisible padding of the clock (which is +- // 33% of the font size) +- measuredSizes.setBottomViewMarginPx(-1 * (int)(measuredSizes.mClockFontSizePx * 0.33 / 2)); +- // We want the bottom padding of the date be equal to the top padding of the clock +- measuredSizes.setBottomViewPaddingPx( +- (int)(measuredSizes.mClockFontSizePx * 0.28 - measuredSizes.mFontSizePx * 0.33)); +- bottomView.setPadding(0, 0, 0, measuredSizes.getBottomViewPaddingPx()); +- LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) +- bottomView.getLayoutParams(); +- layoutParams.topMargin = measuredSizes.getBottomViewMarginTopPx(); +- bottomView.setLayoutParams(layoutParams); + + // Measure and layout the sizer. + final int widthSize = View.MeasureSpec.getSize(measuredSizes.mTargetWidthPx); +@@ -475,6 +444,11 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + measuredSizes.mMeasuredTextClockWidthPx = clock.getMeasuredWidth(); + measuredSizes.mMeasuredTextClockHeightPx = clock.getMeasuredHeight(); + ++ // If an alarm icon is required, generate one from the TextView with the special font. ++ if (nextAlarmIcon.getVisibility() == VISIBLE) { ++ measuredSizes.mIconBitmap = Utils.createBitmap(nextAlarmIcon); ++ } ++ + return measuredSizes; + } + +@@ -509,6 +483,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + private final int mTargetHeightPx; + private final int mLargestClockFontSizePx; + private final int mSmallestClockFontSizePx; ++ private Bitmap mIconBitmap; + + private int mMeasuredWidthPx; + private int mMeasuredHeightPx; +@@ -524,9 +499,6 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + private int mIconFontSizePx; + private int mIconPaddingPx; + +- private int mBottomViewMarginTopPx; +- private int mBottomViewPaddingBottomPx; +- + private Sizes(int targetWidthPx, int targetHeightPx, int largestClockFontSizePx) { + mTargetWidthPx = targetWidthPx; + mTargetHeightPx = targetHeightPx; +@@ -539,21 +511,11 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { + private int getClockFontSizePx() { return mClockFontSizePx; } + private void setClockFontSizePx(int clockFontSizePx) { + mClockFontSizePx = clockFontSizePx; +- mFontSizePx = max(1, round(clockFontSizePx / 5.5f)); ++ mFontSizePx = max(1, round(clockFontSizePx / 7.5f)); + mIconFontSizePx = (int) (mFontSizePx * 1.4f); + mIconPaddingPx = mFontSizePx / 3; + } + +- private int getBottomViewMarginTopPx() { return mBottomViewMarginTopPx; } +- private void setBottomViewMarginPx(int bottomViewMarginPx) { +- mBottomViewMarginTopPx = bottomViewMarginPx; +- } +- +- private int getBottomViewPaddingPx() { return mBottomViewPaddingBottomPx; } +- private void setBottomViewPaddingPx(int bottomViewPaddingPx) { +- mBottomViewPaddingBottomPx = bottomViewPaddingPx; +- } +- + /** + * @return the amount of widget height available to the world cities list + */ +diff --git a/src/com/android/alarmclock/WidgetUtils.java b/src/com/android/alarmclock/WidgetUtils.java +index 46339029c..7ad2df7b8 100644 +--- a/src/com/android/alarmclock/WidgetUtils.java ++++ b/src/com/android/alarmclock/WidgetUtils.java +@@ -26,11 +26,6 @@ import com.android.deskclock.Utils; + + public final class WidgetUtils { + +- private static String PREFS_NAME = "com.android.alarmclock.widgets"; +- private static String PREF_PREFIX_KEY = "appwidget_"; +- private static String PREF_MODE_PREFIX = PREF_PREFIX_KEY + "solid_"; +- +- + private WidgetUtils() {} + + // Calculate the scale factor of the fonts in the widget +@@ -97,27 +92,4 @@ public final class WidgetUtils { + } + return 1; + } +- +- public static void saveWidgetMode(Context context, int appWidgetId, boolean isSolid) { +- context.getSharedPreferences(PREFS_NAME, 0).edit() +- .putBoolean(PREF_MODE_PREFIX + appWidgetId, isSolid) +- .commit(); +- } +- +- public static boolean getWidgetMode(Context context, int appWidgetId) { +- return context.getSharedPreferences(PREFS_NAME, 0) +- .getBoolean(PREF_MODE_PREFIX + appWidgetId, false); +- } +- +- public static int[] getWidgetLayouts(Context context, int appWidgetId) { +- int[] layoutIds = new int[2]; +- if (getWidgetMode(context, appWidgetId)) { +- layoutIds[0] = R.layout.digital_widget_darkbg_solid_theme_root; +- layoutIds[1] = R.layout.digital_widget_lightbg_solid_theme_root; +- } else { +- layoutIds[0] = R.layout.digital_widget_darkbg_theme_root; +- layoutIds[1] = R.layout.digital_widget_lightbg_theme_root; +- } +- return layoutIds; +- } + } +diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java +index ed44315b0..4eea6beba 100644 +--- a/src/com/android/deskclock/Utils.java ++++ b/src/com/android/deskclock/Utils.java +@@ -359,7 +359,7 @@ public class Utils { + final Spannable sp = new SpannableString(pattern); + sp.setSpan(new RelativeSizeSpan(amPmRatio), amPmPos, amPmPos + 1, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); +- sp.setSpan(new StyleSpan(Typeface.BOLD), amPmPos, amPmPos + 1, ++ sp.setSpan(new StyleSpan(Typeface.NORMAL), amPmPos, amPmPos + 1, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + sp.setSpan(new TypefaceSpan("sans-serif"), amPmPos, amPmPos + 1, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); +-- +2.34.1 + diff --git a/patches_platform_personal/packages_apps_DeskClock/0002-Revert-DeskClock-update-digital-widget.patch b/patches_platform_personal/packages_apps_DeskClock/0002-Revert-DeskClock-update-digital-widget.patch new file mode 100644 index 0000000..49e3dbd --- /dev/null +++ b/patches_platform_personal/packages_apps_DeskClock/0002-Revert-DeskClock-update-digital-widget.patch @@ -0,0 +1,156 @@ +From 7ee7d93a6596567c0b799ba00091db3950b83fe0 Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 7 May 2023 14:24:32 +0000 +Subject: [PATCH 2/5] Revert "DeskClock: update digital widget" + +This reverts commit a9e6a18d1abd5f3ee2ec816d031f2a69ea1f6028. +--- + res/layout/digital_widget.xml | 5 +++-- + res/layout/digital_widget_sizer.xml | 5 +++-- + res/values-h560dp/dimens.xml | 2 +- + res/values-h650dp/dimens.xml | 2 +- + res/values-sw600dp-land/dimens.xml | 2 +- + res/values-sw600dp/dimens.xml | 2 +- + res/values-sw720dp/dimens.xml | 2 +- + res/values/dimens.xml | 2 +- + res/values/styles.xml | 6 ++---- + 9 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml +index d09cba64c..5cf896a84 100644 +--- a/res/layout/digital_widget.xml ++++ b/res/layout/digital_widget.xml +@@ -24,7 +24,7 @@ + + ++ android:singleLine="true" ++ android:textColor="@color/white" /> + + ++ android:singleLine="true" ++ android:textColor="@color/white" /> + + + +- 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-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml +index f647ef5b4..157e8b4ba 100644 +--- a/res/values-sw600dp-land/dimens.xml ++++ b/res/values-sw600dp-land/dimens.xml +@@ -24,5 +24,5 @@ + 48dp + + +- 90dp ++ 100dp + +diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml +index bde6b225c..2c3a50de6 100644 +--- a/res/values-sw600dp/dimens.xml ++++ b/res/values-sw600dp/dimens.xml +@@ -63,5 +63,5 @@ + + 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/dimens.xml b/res/values/dimens.xml +index c26d93ddd..c136fe25a 100644 +--- a/res/values/dimens.xml ++++ b/res/values/dimens.xml +@@ -95,7 +95,7 @@ + + 10dp + +- 80dp ++ 88dp + 80dp + + +diff --git a/res/values/styles.xml b/res/values/styles.xml +index 683df4ee5..8c6364344 100644 +--- a/res/values/styles.xml ++++ b/res/values/styles.xml +@@ -72,14 +72,12 @@ + sans-serif-thin + + +- + +