Skip to content

Commit 8b298ba

Browse files
committed
Merge branch 'trunk' into feature/author-button-to-post-settings
2 parents d966c4a + 69baa39 commit 8b298ba

File tree

95 files changed

+1272
-588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1272
-588
lines changed

RELEASE-NOTES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
20.8
44
-----
55
* [**] Added author button to the post settings and the author of the post can be changed with it. [https://github.com/wordpress-mobile/WordPress-Android/pull/17120]
6+
* [*] [Jetpack-only] Adds more widgets, At a glance, All-time and Today widgets with dynamic previews [https://github.com/wordpress-mobile/WordPress-Android/pull/17140]
7+
68

79
20.7
810
-----

WordPress/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ android {
121121
buildConfigField "boolean", "JETPACK_POWERED", "true"
122122
buildConfigField "boolean", "JETPACK_POWERED_BOTTOM_SHEET", "false"
123123
buildConfigField "boolean", "JETPACK_SHARED_LOGIN", "false"
124+
buildConfigField "boolean", "JETPACK_LOCAL_USER_FLAGS", "false"
124125

125126
// Override these constants in jetpack product flavor to enable/ disable features
126127
buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<appwidget-provider
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:configure="org.wordpress.android.ui.stats.refresh.lists.widget.weeks.StatsWeekWidgetConfigureActivity"
6+
android:initialKeyguardLayout="@layout/stats_widget_list_light"
7+
android:initialLayout="@layout/stats_widget_list_light"
8+
android:minHeight="110dp"
9+
android:minResizeWidth="150dp"
10+
android:minWidth="250dp"
11+
android:previewLayout="@layout/stats_week_views_widget_preview"
12+
android:resizeMode="horizontal"
13+
android:updatePeriodMillis="600000"
14+
android:widgetCategory="home_screen"
15+
tools:ignore="UnusedResources">
16+
</appwidget-provider>

WordPress/src/main/AndroidManifest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,6 @@
885885
<receiver
886886
android:name=".ui.stats.refresh.lists.widget.alltime.StatsAllTimeWidget"
887887
android:label="@string/stats_widget_all_time_insights_name"
888-
android:enabled="@string/widgets_enabled"
889888
android:exported="false"
890889
tools:ignore="ManifestResource">
891890
<intent-filter>
@@ -899,7 +898,6 @@
899898
<receiver
900899
android:name=".ui.stats.refresh.lists.widget.today.StatsTodayWidget"
901900
android:label="@string/stats_widget_today_insights_name"
902-
android:enabled="@string/widgets_enabled"
903901
android:exported="false"
904902
tools:ignore="ManifestResource">
905903
<intent-filter>
@@ -913,7 +911,6 @@
913911
<receiver
914912
android:name=".ui.stats.refresh.lists.widget.minified.StatsMinifiedWidget"
915913
android:label="@string/stats_widget_minified_name"
916-
android:enabled="@string/widgets_enabled"
917914
android:exported="false"
918915
tools:ignore="ManifestResource">
919916
<intent-filter>

0 commit comments

Comments
 (0)