Changes for June 2023, syncing up to 20230614

This commit is contained in:
Andy CrossGate Yan
2023-06-22 07:49:58 +08:00
parent 3a82192c9d
commit 1a0d724bf1
169 changed files with 162356 additions and 103328 deletions

View File

@@ -1,28 +1,29 @@
From 8ffb863199ed6e09068a41aa8e701732bed271e6 Mon Sep 17 00:00:00 2001
From ef3810b1d55f079278f3ac3ef83f7b5b2eaaa7c1 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sun, 5 Sep 2021 00:30:33 +0000
Subject: [PATCH 3/5] DeskClock: Remove night mode
Subject: [PATCH 2/4] DeskClock: Remove night mode
Change-Id: I885f39027e78fcda397f1be59d17bc24bc66671a
---
res/xml/screensaver_settings.xml | 6 ------
res/xml/screensaver_settings.xml | 7 -------
src/com/android/deskclock/Screensaver.java | 5 ++---
src/com/android/deskclock/ScreensaverActivity.java | 2 +-
3 files changed, 3 insertions(+), 10 deletions(-)
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/res/xml/screensaver_settings.xml b/res/xml/screensaver_settings.xml
index 49a7f1d89..73375dcfa 100644
index 7b8c9764a..908f76fef 100644
--- a/res/xml/screensaver_settings.xml
+++ b/res/xml/screensaver_settings.xml
@@ -24,10 +24,4 @@
android:key="screensaver_clock_style"
android:title="@string/clock_style" />
@@ -26,11 +26,4 @@
android:title="@string/clock_style"
app:iconSpaceReserved="false" />
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="screensaver_night_mode"
- android:summary="@string/night_mode_summary"
- android:title="@string/night_mode_title" />
- android:title="@string/night_mode_title"
- app:iconSpaceReserved="false" />
-
</PreferenceScreen>
diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java

View File

@@ -1,156 +0,0 @@
From 7ee7d93a6596567c0b799ba00091db3950b83fe0 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
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 @@
<TextClock
android:id="@+id/clock"
- style="@style/widget_big"
+ style="@style/widget_big_thin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
@@ -32,7 +32,8 @@
android:format12Hour="@string/lock_screen_12_hour_format"
android:format24Hour="@string/lock_screen_24_hour_format"
android:includeFontPadding="false"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:textColor="@color/white" />
<LinearLayout
android:layout_width="wrap_content"
diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
index be7677ba7..f524cf536 100644
--- a/res/layout/digital_widget_sizer.xml
+++ b/res/layout/digital_widget_sizer.xml
@@ -21,7 +21,7 @@
<TextClock
android:id="@+id/clock"
- style="@style/widget_big"
+ style="@style/widget_big_thin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|top"
@@ -29,7 +29,8 @@
android:ellipsize="none"
android:format12Hour="@string/lock_screen_12_hour_format"
android:format24Hour="@string/lock_screen_24_hour_format"
- android:singleLine="true" />
+ android:singleLine="true"
+ android:textColor="@color/white" />
<LinearLayout
android:layout_width="wrap_content"
diff --git a/res/values-h560dp/dimens.xml b/res/values-h560dp/dimens.xml
index 403e19f93..7bf0909b1 100644
--- a/res/values-h560dp/dimens.xml
+++ b/res/values-h560dp/dimens.xml
@@ -16,5 +16,5 @@
<resources>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">86dp</dimen>
+ <dimen name="widget_max_clock_font_size">96dp</dimen>
</resources>
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 @@
<resources>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">90dp</dimen>
+ <dimen name="widget_max_clock_font_size">100dp</dimen>
</resources>
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 @@
<dimen name="analog_clock_margin">48dp</dimen>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">90dp</dimen>
+ <dimen name="widget_max_clock_font_size">100dp</dimen>
</resources>
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 @@
<!-- The fixed size of the font for the city name / day of week in the city widget. -->
<dimen name="city_widget_name_font_size">20dp</dimen>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">112dp</dimen>
+ <dimen name="widget_max_clock_font_size">125dp</dimen>
</resources>
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 @@
<dimen name="analog_clock_size">312dp</dimen>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">124dp</dimen>
+ <dimen name="widget_max_clock_font_size">138dp</dimen>
</resources>
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 @@
<!-- The fixed size of the font for the city name / day of week in the city widget. -->
<dimen name="city_widget_name_font_size">10dp</dimen>
<!-- The maximum size of the font for the time in widgets. -->
- <dimen name="widget_max_clock_font_size">80dp</dimen>
+ <dimen name="widget_max_clock_font_size">88dp</dimen>
<dimen name="widget_min_world_city_list_size">80dp</dimen>
<!-- shadow styles for widget text with drop shadows -->
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 @@
<item name="android:fontFamily">sans-serif-thin</item>
</style>
- <style name="widget_big" parent="big_thin">
+ <style name="widget_big_thin" parent="big_thin">
<item name="android:shadowRadius">@dimen/widget_shadow_radius</item>
<item name="android:shadowColor">@color/widget_shadow_color</item>
<item name="android:shadowDx">@dimen/widget_shadow_dx</item>
<item name="android:shadowDy">@dimen/widget_shadow_dy</item>
- <item name="android:fontFamily">sans-serif-condensed</item>
- <item name="android:textColor">@*android:color/system_accent2_100</item>
- <item name="android:scaleY">0.9</item>
+ <item name="android:fontFamily">sans-serif-thin</item>
</style>
<style name="PrimaryLabelTextParentAppearance">
--
2.34.1

View File

@@ -1,7 +1,7 @@
From acb86d43b61a02dbad16bd56a2a0bc3f770b46f9 Mon Sep 17 00:00:00 2001
From 3430de2c592c9d9b4a08c16477fff4ad1a4ca775 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 19 Jan 2022 18:04:36 +0000
Subject: [PATCH 4/5] DeskClock: Adapt digital clocks to S style
Subject: [PATCH 3/4] DeskClock: Adapt digital clocks to S style
Lollipop is so yesterday...
Bring the layouts of various digital clocks (app, widget, daydream)

View File

@@ -1,7 +1,7 @@
From cb345f3431711b6df77eadfe88cee2101d34bea3 Mon Sep 17 00:00:00 2001
From 169570068c3a78f7294d581b2df864ccd3057579 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Thu, 20 Jan 2022 04:42:03 +0000
Subject: [PATCH 5/5] DeskClock: Wallpaper-based text coloring for digital
Subject: [PATCH 4/4] DeskClock: Wallpaper-based text coloring for digital
clock widget
RemoteViews is such a restrictive PITA