Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 14.6-rc-2 to develop #11668

Merged
merged 5 commits into from
Apr 16, 2020
Merged

Merge 14.6-rc-2 to develop #11668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db85f24
Change parent style of NoDisplay activity to WordPress.NoActionBar
khaykov Apr 8, 2020
5d51670
Merge pull request #11623 from wordpress-mobile/issue/11616-use-mater…
renanferrari Apr 8, 2020
c2f298a
Bump version number
oguzkocer Apr 9, 2020
02aed88
Remove release note releated to heading toolbar alignment
oguzkocer Apr 15, 2020
d098a95
Update metadata strings
oguzkocer Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ android {
if (project.hasProperty("versionName")) {
versionName project.property("versionName")
} else {
versionName "alpha-215"
versionName "alpha-216"
}
versionCode 847
versionCode 849
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion

Expand All @@ -84,9 +84,9 @@ android {
dimension "buildType"
// Only set the release version if one isn't provided
if (!project.hasProperty("versionName")) {
versionName "14.6-rc-1"
versionName "14.6-rc-2"
}
versionCode 846
versionCode 848
buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
}

Expand Down
2 changes: 1 addition & 1 deletion WordPress/metadata/PlayStoreStrings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ msgstr ""
msgctxt "release_note_146"
msgid ""
"14.6:\n"
"Block editor enhancements: Added Cover block. Enabled crop, zoom, and rotate for images in posts. Tweaked “Take a Video” icon to differentiate from “Take a Photo.” Removed dimming effect on unselected blocks. Added toolbar for alignment options in Heading, Paragraph, Image, and MediaText blocks.\n"
"Block editor enhancements: Added Cover block. Enabled crop, zoom, and rotate for images in posts. Tweaked “Take a Video” icon to differentiate from “Take a Photo.” Removed dimming effect on unselected blocks. Added toolbar for alignment options in Paragraph, Image, and MediaText blocks.\n"
"\n"
"Fixes: Issue where “wordpress://” links in a browser didn’t open the app, issue where opening a page opened an empty editor.\n"
"\n"
Expand Down
2 changes: 1 addition & 1 deletion WordPress/metadata/release_notes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Block editor enhancements: Added Cover block. Enabled crop, zoom, and rotate for images in posts. Tweaked “Take a Video” icon to differentiate from “Take a Photo.” Removed dimming effect on unselected blocks. Added toolbar for alignment options in Heading, Paragraph, Image, and MediaText blocks.
Block editor enhancements: Added Cover block. Enabled crop, zoom, and rotate for images in posts. Tweaked “Take a Video” icon to differentiate from “Take a Photo.” Removed dimming effect on unselected blocks. Added toolbar for alignment options in Paragraph, Image, and MediaText blocks.

Fixes: Issue where “wordpress://” links in a browser didn’t open the app, issue where opening a page opened an empty editor.

Expand Down
3 changes: 1 addition & 2 deletions WordPress/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,7 @@
<item name="android:dropDownListViewStyle">@style/DropDownListView.Light.WordPress</item>
</style>

<style name="NoDisplay" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowNoTitle">true</item>
<style name="NoDisplay" parent="WordPress.NoActionBar">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowIsTranslucent">true</item>
Expand Down