Update compileSdk and targetSdk to 36 by nbradbury · Pull Request #22695 · wordpress-mobile/WordPress-Android

nbradbury · 2026-03-16T17:57:47Z

Description

Updates compileSdkVersion and targetSdkVersion from 35 to 36 and addresses all resulting compilation errors, deprecation warnings, and behavioral changes:

Edge-to-edge enforcement: SDK 36 enforces edge-to-edge by default. Removed the NoEdgeToEdge opt-out from the manifest and added EdgeToEdgeActivityLifecycleCallbacks to apply inset padding to third-party activities (e.g. Zendesk) that don't extend BaseAppCompatActivity.
IME inset handling: Added WindowInsetsCompat.Type.ime() to both BaseAppCompatActivity and EdgeToEdgeActivityLifecycleCallbacks so the keyboard doesn't overlap editors — replacing the old adjustResize behavior that edge-to-edge disables.
Zendesk status bar fix: Set windowLightStatusBar to true in the day Zendesk style so status bar icons are visible (dark on light background) now that statusBarColor is ignored.
Deprecation fixes (Kotlin): Replaced deprecated Configuration.locale with ConfigurationCompat.getLocales() in LocaleManager, updated PrefMainSwitchToolbarView and NotificationsSettingsActivity for SDK 36 API changes.
Deprecation fixes (Java): Updated CommentDetailFragment, MediaPickerUtils, and GutenbergUtils to use non-deprecated alternatives.
announceForAccessibility suppressions: Added @Suppress("DEPRECATION") to all call sites (replacement with live regions is a separate effort).

Testing instructions

Build verification:

Build the app: ./gradlew assembleWordPressDebug

Verify build succeeds with no errors

Edge-to-edge on SDK 36:

Run the app on an API 36 emulator or device
Navigate through the app — check the main screen, reader, stats, posts

Verify content is not obscured by status bar, navigation bar, or display cutout

Open a Zendesk help screen (Help & Support)

Verify Zendesk screens also have correct inset padding
Verify the status bar is visible in both light and dark modes

Keyboard overlap:

Run the app on an API 35 emulator or device
Make sure the keyboard overlap issues haven't re-appeared

Open the post editor and verify the keyboard doesn't cover the bottom of the editor (Hotfix: Exclude editor from edge-to-edge #21731)
Test the comment editor and notification comment editor (Fix editor activities for edge-to-edge #21733)
Test the Zendesk "Contact us" screen — keyboard should not overlap the text input

General regression:

Test basic flows: login, browse reader, view stats, create/edit a post

Verify no visual regressions or crashes

- Fix onCheckedChanged signature: CompoundButton parameter is now non-null in SDK 36 (PrefMainSwitchToolbarView, its interface, and NotificationsSettingsActivity) - Suppress deprecated announceForAccessibility() calls across 11 files (13 call sites) — replacement with live regions is a separate effort - Replace deprecated Locale constructors with Locale.Builder in LocaleManager Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

The windowOptOutEdgeToEdgeEnforcement attribute is deprecated and ignored on SDK 36, so the NoEdgeToEdge style no longer prevents edge-to-edge. Instead, let the 6 affected activities go through BaseAppCompatActivity.applyInsetOffsets() by removing them from the exclusion list, and add ActivityLifecycleCallbacks to handle insets for Zendesk activities that don't extend BaseAppCompatActivity. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Suppress announceForAccessibility deprecation in CommentDetailFragment, WPMainActivity, and MediaPickerUtils. Replace deprecated Locale constructor with Locale.Builder in GutenbergUtils. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Use getLocales() and setLocales() instead of the deprecated Configuration.locale field and setLocale() method. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

dangermattic · 2026-03-16T17:58:34Z

	3 Warnings
⚠️	View files have been modified, but no screenshot or video is included in the pull request. Consider adding some for clarity.
⚠️	Class `EdgeToEdgeActivityLifecycleCallbacks` is missing tests, but `unit-tests-exemption` label was set to ignore this.
⚠️	PR is not assigned to a milestone.

Generated by 🚫 Danger

wpmobilebot · 2026-03-16T18:03:17Z

Project manifest changes for WordPress

The following changes in the WordPress's merged AndroidManifest.xml file were detected (build variant: wordpressRelease):

--- ./build/reports/diff_manifest/WordPress/wordpressRelease/base_manifest.txt	2026-03-16 21:02:30.298339034 +0000
+++ ./build/reports/diff_manifest/WordPress/wordpressRelease/head_manifest.txt	2026-03-16 21:02:36.308353302 +0000
@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="26"
-        android:targetSdkVersion="35" />
+        android:targetSdkVersion="36" />
 
     <permission
         android:name="org.wordpress.android.permission.DISABLE_NOTIFICATIONS"
@@ -311,7 +311,7 @@
             android:theme="@style/WordPress.ZenDesk" />
         <activity
             android:name="org.wordpress.android.support.SupportWebViewActivity"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge" /> <!-- empty title -->
+            android:theme="@style/WordPress.NoActionBar" /> <!-- empty title -->
         <!-- Preferences activities -->
         <activity
             android:name="org.wordpress.android.ui.about.UnifiedAboutActivity"
@@ -376,7 +376,7 @@
         <activity
             android:name="org.wordpress.android.ui.comments.CommentsDetailActivity"
             android:label="@string/comments"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
+            android:theme="@style/WordPress.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.wordpress.android.ui.comments.unified.UnifiedCommentsDetailsActivity"
@@ -387,7 +387,7 @@
             android:name="org.wordpress.android.ui.posts.EditPostActivity"
             android:configChanges="locale|orientation|screenSize"
             android:exported="false"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
+            android:theme="@style/WordPress.NoActionBar"
             android:windowSoftInputMode="stateHidden|adjustResize" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -844,7 +844,7 @@
         <activity
             android:name="org.wordpress.android.ui.reader.ReaderCommentListActivity"
             android:label="@string/reader_title_comments"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
+            android:theme="@style/WordPress.NoActionBar"
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name="org.wordpress.android.ui.reader.NoSiteToReblogActivity"
@@ -858,7 +858,7 @@
             android:theme="@style/WordPress.NoActionBar" />
         <activity
             android:name="org.wordpress.android.ui.reader.ReaderSubsActivity"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
+            android:theme="@style/WordPress.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="org.wordpress.android.ui.reader.ReaderPhotoViewerActivity"
@@ -927,7 +927,7 @@
             android:theme="@style/WordPress.NoActionBar" /> <!-- Notifications activities -->
         <activity
             android:name="org.wordpress.android.ui.notifications.NotificationsDetailActivity"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge" /> <!-- People Management -->
+            android:theme="@style/WordPress.NoActionBar" /> <!-- People Management -->
         <activity
             android:name="org.wordpress.android.ui.people.PeopleManagementActivity"
             android:label="@string/users"

Go to https://buildkite.com/automattic/wordpress-android/builds/25499/canvas?sid=019cf86e-7405-4d9f-a33f-036b0828a120, click on the Artifacts tab and audit the files.

wpmobilebot · 2026-03-16T18:03:59Z

Project manifest changes for WordPress

The following changes in the WordPress's merged AndroidManifest.xml file were detected (build variant: jetpackRelease):

--- ./build/reports/diff_manifest/WordPress/jetpackRelease/base_manifest.txt	2026-03-16 21:02:24.016634929 +0000
+++ ./build/reports/diff_manifest/WordPress/jetpackRelease/head_manifest.txt	2026-03-16 21:02:30.216684192 +0000
@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="26"
-        android:targetSdkVersion="35" />
+        android:targetSdkVersion="36" />
 
     <uses-permission android:name="org.wordpress.android.permission.DISABLE_NOTIFICATIONS" /> <!-- Normal permissions, access automatically granted to app -->
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -503,7 +503,7 @@
             android:theme="@style/WordPress.ZenDesk" />
         <activity
             android:name="org.wordpress.android.support.SupportWebViewActivity"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge" /> <!-- empty title -->
+            android:theme="@style/WordPress.NoActionBar" /> <!-- empty title -->
         <!-- Preferences activities -->
         <activity
             android:name="org.wordpress.android.ui.about.UnifiedAboutActivity"
@@ -568,7 +568,7 @@
         <activity
             android:name="org.wordpress.android.ui.comments.CommentsDetailActivity"
             android:label="@string/comments"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
+            android:theme="@style/WordPress.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.wordpress.android.ui.comments.unified.UnifiedCommentsDetailsActivity"
@@ -579,7 +579,7 @@
             android:name="org.wordpress.android.ui.posts.EditPostActivity"
             android:configChanges="locale|orientation|screenSize"
             android:exported="false"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
+            android:theme="@style/WordPress.NoActionBar"
             android:windowSoftInputMode="stateHidden|adjustResize" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -869,7 +869,7 @@
         <activity
             android:name="org.wordpress.android.ui.reader.ReaderCommentListActivity"
             android:label="@string/reader_title_comments"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
+            android:theme="@style/WordPress.NoActionBar"
             android:windowSoftInputMode="adjustResize|stateHidden" />
         <activity
             android:name="org.wordpress.android.ui.reader.NoSiteToReblogActivity"
@@ -883,7 +883,7 @@
             android:theme="@style/WordPress.NoActionBar" />
         <activity
             android:name="org.wordpress.android.ui.reader.ReaderSubsActivity"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge"
+            android:theme="@style/WordPress.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
         <activity
             android:name="org.wordpress.android.ui.reader.ReaderPhotoViewerActivity"
@@ -952,7 +952,7 @@
             android:theme="@style/WordPress.NoActionBar" /> <!-- Notifications activities -->
         <activity
             android:name="org.wordpress.android.ui.notifications.NotificationsDetailActivity"
-            android:theme="@style/WordPress.NoActionBar.NoEdgeToEdge" /> <!-- People Management -->
+            android:theme="@style/WordPress.NoActionBar" /> <!-- People Management -->
         <activity
             android:name="org.wordpress.android.ui.people.PeopleManagementActivity"
             android:label="@string/users"

Go to https://buildkite.com/automattic/wordpress-android/builds/25499/canvas?sid=019cf86e-7408-4dc3-b9c0-61a3321e7bf5, click on the Artifacts tab and audit the files.

wpmobilebot · 2026-03-16T18:26:22Z

📲 You can test the changes from this Pull Request in Jetpack Android by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Android
	Build Type	Debug
	Version	pr22695-a777cfa
	Build Number	`1487`
	Application ID	`com.jetpack.android.prealpha`
	Commit	`a777cfa`
	Installation URL	5lmub9og2ccj8

Note: Google Login is not supported on these builds.

wpmobilebot · 2026-03-16T18:27:16Z

📲 You can test the changes from this Pull Request in WordPress Android by scanning the QR code below to install the corresponding build.

	App Name	WordPress Android
	Build Type	Debug
	Version	pr22695-a777cfa
	Build Number	`1487`
	Application ID	`org.wordpress.android.prealpha`
	Commit	`a777cfa`
	Installation URL	26b8ko5hfqgqg

Note: Google Login is not supported on these builds.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

With edge-to-edge enforced, statusBarColor is ignored and the status bar is transparent. Set windowLightStatusBar to true in the day Zendesk style so icons are dark on the light background. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

With edge-to-edge enforced, adjustResize no longer shrinks the content area automatically. Include ime() in the inset types so the decorView padding accounts for the keyboard height. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

codecov · 2026-03-16T19:38:22Z

Codecov Report

❌ Patch coverage is 0% with 33 lines in your changes missing coverage. Please review.
✅ Project coverage is 37.60%. Comparing base (f662c9e) to head (a777cfa).
⚠️ Report is 5 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...id/ui/main/EdgeToEdgeActivityLifecycleCallbacks.kt	0.00%	27 Missing ⚠️
...s/src/main/java/org/wordpress/android/WordPress.kt	0.00%	4 Missing ⚠️
...n/java/org/wordpress/android/util/LocaleManager.kt	0.00%	2 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##            trunk   #22695      +/-   ##
==========================================
- Coverage   37.61%   37.60%   -0.01%     
==========================================
  Files        2272     2273       +1     
  Lines      118379   118405      +26     
  Branches    16370    16372       +2     
==========================================
  Hits        44531    44531              
- Misses      70196    70222      +26     
  Partials     3652     3652

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

sonarqubecloud · 2026-03-16T20:56:55Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

adalpari

LGTM and I haven't found any error while testing on devices

nbradbury and others added 6 commits March 16, 2026 13:39

Update compileSdkVersion and targetSkdVersion to 36

dad5337

Replace deprecated Configuration.locale and setLocale for SDK 36

1a24f97

Use getLocales() and setLocales() instead of the deprecated Configuration.locale field and setLocale() method. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Fix checkstyle violation: remove empty line after opening brace

5b122a0

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

nbradbury added unit-tests-exemption bot: dependencies update Dependabot dependency update Tech Debt labels Mar 16, 2026

nbradbury and others added 5 commits March 16, 2026 14:32

Use idiomatic Kotlin 'in' operator for activity name check

ef7c994

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Suppress announceForAccessibility deprecation warning in test

12b83f7

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Handle IME insets for Zendesk activities to prevent keyboard overlap

6afff6d

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Add clarifying comments from code review feedback

a777cfa

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

nbradbury marked this pull request as ready for review March 16, 2026 21:32

nbradbury requested review from adalpari and jkmassel March 16, 2026 21:33

adalpari approved these changes Mar 17, 2026

View reviewed changes

nbradbury merged commit b7c4ddd into trunk Mar 17, 2026
31 of 33 checks passed

nbradbury deleted the issue/compileSdk36 branch March 17, 2026 12:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update compileSdk and targetSdk to 36#22695

Update compileSdk and targetSdk to 36#22695
nbradbury merged 12 commits intotrunkfrom
issue/compileSdk36

nbradbury commented Mar 16, 2026 •

edited by adalpari

Loading

Uh oh!

dangermattic commented Mar 16, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 16, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 16, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 16, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Mar 16, 2026 •

edited

Loading

Uh oh!

codecov bot commented Mar 16, 2026 •

edited

Loading

Uh oh!

sonarqubecloud bot commented Mar 16, 2026

Uh oh!

adalpari left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

nbradbury commented Mar 16, 2026 • edited by adalpari Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Testing instructions

Uh oh!

dangermattic commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Project manifest changes for WordPress

Uh oh!

wpmobilebot commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Project manifest changes for WordPress

Uh oh!

wpmobilebot commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sonarqubecloud bot commented Mar 16, 2026

Quality Gate passed

Uh oh!

adalpari left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

nbradbury commented Mar 16, 2026 •

edited by adalpari

Loading

dangermattic commented Mar 16, 2026 •

edited

Loading

wpmobilebot commented Mar 16, 2026 •

edited

Loading

wpmobilebot commented Mar 16, 2026 •

edited

Loading

wpmobilebot commented Mar 16, 2026 •

edited

Loading

wpmobilebot commented Mar 16, 2026 •

edited

Loading

codecov bot commented Mar 16, 2026 •

edited

Loading