Skip to content

Commit 0a53564

Browse files
committed
Merge branch 'trunk' into issue/16491-fix-percent-sign-localized
2 parents f3961d2 + d92c3f8 commit 0a53564

File tree

88 files changed

+1955
-971
lines changed

Some content is hidden

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

88 files changed

+1955
-971
lines changed

RELEASE-NOTES.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
20.8
44
-----
5-
5+
* [**] Stats: Always use Western Arabic numerals in Arabic languages (previously there was a mix of Eastern and Western Arabic numerals) [https://github.com/wordpress-mobile/WordPress-Android/pull/17160]
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+
* [**] 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]
68

79
20.7
810
-----
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>

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import com.automattic.android.tracks.crashlogging.CrashLogging;
44

5-
import org.wordpress.android.sharedlogin.provider.SharedLoginProvider;
65
import org.wordpress.android.push.GCMMessageService;
76
import org.wordpress.android.push.GCMRegistrationIntentService;
87
import org.wordpress.android.push.NotificationsProcessingService;
8+
import org.wordpress.android.sharedlogin.provider.SharedLoginProvider;
99
import org.wordpress.android.ui.AddQuickPressShortcutActivity;
1010
import org.wordpress.android.ui.CommentFullScreenDialogFragment;
1111
import org.wordpress.android.ui.JetpackConnectionResultActivity;
@@ -118,6 +118,7 @@
118118
import org.wordpress.android.ui.posts.PostListCreateMenuFragment;
119119
import org.wordpress.android.ui.posts.PostListFragment;
120120
import org.wordpress.android.ui.posts.PostNotificationScheduleTimeDialogFragment;
121+
import org.wordpress.android.ui.posts.PostSettingsListDialogFragment;
121122
import org.wordpress.android.ui.posts.PostSettingsTagsFragment;
122123
import org.wordpress.android.ui.posts.PostTimePickerDialogFragment;
123124
import org.wordpress.android.ui.posts.PostsListActivity;
@@ -201,10 +202,10 @@
201202
import org.wordpress.android.ui.stats.refresh.lists.widget.today.StatsTodayWidget;
202203
import org.wordpress.android.ui.stats.refresh.lists.widget.today.TodayWidgetBlockListProviderFactory;
203204
import org.wordpress.android.ui.stats.refresh.lists.widget.today.TodayWidgetListProvider;
204-
import org.wordpress.android.ui.stats.refresh.lists.widget.weeks.StatsWeekWidget;
205-
import org.wordpress.android.ui.stats.refresh.lists.widget.weeks.WeekViewsWidgetListProvider;
206205
import org.wordpress.android.ui.stats.refresh.lists.widget.views.StatsViewsWidget;
207206
import org.wordpress.android.ui.stats.refresh.lists.widget.views.ViewsWidgetListProvider;
207+
import org.wordpress.android.ui.stats.refresh.lists.widget.weeks.StatsWeekWidget;
208+
import org.wordpress.android.ui.stats.refresh.lists.widget.weeks.WeekViewsWidgetListProvider;
208209
import org.wordpress.android.ui.stats.refresh.lists.widget.weeks.WeekWidgetBlockListProviderFactory;
209210
import org.wordpress.android.ui.stockmedia.StockMediaPickerActivity;
210211
import org.wordpress.android.ui.stories.StoryComposerActivity;
@@ -342,6 +343,8 @@ public interface AppComponent {
342343

343344
void inject(EditPostSettingsFragment object);
344345

346+
void inject(PostSettingsListDialogFragment object);
347+
345348
void inject(PostsListActivity object);
346349

347350
void inject(PagesActivity object);

0 commit comments

Comments
 (0)