From 9bd35e3a18e355430b7663443c88563a53e6e47e Mon Sep 17 00:00:00 2001
From: Vladimir Daskalov <shugav@gmail.com>
Date: Sat, 18 Apr 2026 17:45:30 -0400
Subject: [PATCH] Fix UCrop screen overlapping the system bars on Android 15+
 (#9084)

Since the app targets SDK 35, Android 15 forces edge-to-edge layout for
every window. UCrop 2.2.8 - the third-party library backing the avatar
and image cropping screen - does not consume WindowInsets, so its
toolbar (containing the save checkmark) is drawn under the status bar
and its bottom rotate / scale controls are drawn under the 3-button
navigation bar. On many devices the save button cannot even be tapped
because the gesture is captured by the status bar.

Apply a dedicated Theme.Vector.UCrop to UCropActivity that, on API 35,
sets android:windowOptOutEdgeToEdgeEnforcement="true" - the official
escape hatch documented for legacy screens that have not yet migrated
to insets-aware layouts. The base theme keeps uCrop's expected
AppCompat.Light.NoActionBar parent, so behaviour on API < 35 is
unchanged.

Signed-off-by: Vladimir Daskalov <shugav@gmail.com>
---
 changelog.d/9084.bugfix                       |  1 +
 .../src/main/res/values-v35/theme_ucrop.xml   | 21 +++++++++++++++++++
 .../src/main/res/values/theme_ucrop.xml       | 21 +++++++++++++++++++
 vector/src/main/AndroidManifest.xml           |  3 ++-
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/9084.bugfix
 create mode 100644 library/ui-styles/src/main/res/values-v35/theme_ucrop.xml
 create mode 100644 library/ui-styles/src/main/res/values/theme_ucrop.xml

diff --git a/changelog.d/9084.bugfix b/changelog.d/9084.bugfix
new file mode 100644
index 00000000000..b54bc4cd004
--- /dev/null
+++ b/changelog.d/9084.bugfix
@@ -0,0 +1 @@
+Fix the avatar / image cropping screen on Android 15+: the toolbar save button and the bottom rotate / scale controls are no longer hidden behind the system status bar and 3-button navigation bar. ([#9084](https://github.com/element-hq/element-android/issues/9084))
diff --git a/library/ui-styles/src/main/res/values-v35/theme_ucrop.xml b/library/ui-styles/src/main/res/values-v35/theme_ucrop.xml
new file mode 100644
index 00000000000..6b4616d4cbd
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v35/theme_ucrop.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!--
+        Android 15 (API 35) forces every window to be edge-to-edge when the app
+        targets SDK 35+. UCrop 2.2.8 does not handle WindowInsets, which causes
+        its title bar (close / save) to be hidden behind the status bar and the
+        rotate / scale controls to be hidden behind 3-button navigation.
+
+        windowOptOutEdgeToEdgeEnforcement is the official escape hatch documented
+        for legacy screens that have not yet been migrated to insets-aware layout.
+        It is honoured on API 35 only; on API 36+ we will need to either upgrade
+        UCrop or override its layouts to consume insets directly.
+
+        Tracks https://github.com/element-hq/element-android/issues/9084
+    -->
+    <style name="Theme.Vector.UCrop" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
+    </style>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/theme_ucrop.xml b/library/ui-styles/src/main/res/values/theme_ucrop.xml
new file mode 100644
index 00000000000..f37c621b237
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_ucrop.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+        Theme applied to com.yalantis.ucrop.UCropActivity.
+
+        UCrop 2.2.8 (the version pinned in :vector) does not consume window insets,
+        so its toolbar and bottom controls are drawn under the system bars when the
+        platform enforces edge-to-edge layout (Android 15 / API 35+).
+
+        On older API levels there is nothing to do here: the system bars are opaque
+        and the activity already lays out within them. The v35 override of this
+        theme opts the activity out of edge-to-edge enforcement so the toolbar's
+        save button and the bottom rotate / scale controls remain reachable.
+
+        AppCompat.Light.NoActionBar matches the parent declared by uCrop's own
+        manifest entry, so the activity continues to render its custom toolbar.
+    -->
+    <style name="Theme.Vector.UCrop" parent="Theme.AppCompat.Light.NoActionBar" />
+
+</resources>
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index b035f866fe3..36ff86f4773 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -293,7 +293,8 @@
         <activity android:name=".features.crypto.quads.SharedSecureStorageActivity" />
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Vector.UCrop" />
         <activity
             android:name=".features.attachments.preview.AttachmentsPreviewActivity"
             android:theme="@style/Theme.Vector.Black.AttachmentsPreview" />