From 7829ff0a83cfdd0d4bc4a38a56141d01f39a9727 Mon Sep 17 00:00:00 2001
From: adbenitez <asieldbenitez@gmail.com>
Date: Wed, 26 Nov 2025 06:01:49 +0100
Subject: [PATCH] CreateProfileActivity: properly implement edge-to-edge

---
 .../org/thoughtcrime/securesms/CreateProfileActivity.java    | 4 +++-
 src/main/res/layout/profile_create_activity.xml              | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
index 3f018f935..991d0bb61 100644
--- a/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -76,7 +76,6 @@ public class CreateProfileActivity extends BaseActionBarActivity {
     getSupportActionBar().setTitle(R.string.pref_profile_info_headline);
     getSupportActionBar().setDisplayHomeAsUpEnabled(!this.fromWelcome);
     getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
-    getSupportActionBar().setElevation(0); // TODO: use custom toolbar instead
 
     attachmentManager = new AttachmentManager(this, () -> {});
     avatarChanged = false;
@@ -182,6 +181,9 @@ public class CreateProfileActivity extends BaseActionBarActivity {
     this.container    = ViewUtil.findById(this, R.id.container);
     this.statusView   = ViewUtil.findById(this, R.id.status_text);
 
+    // add padding to avoid content hidden behind system bars
+    ViewUtil.applyWindowInsets(container);
+
     if (fromWelcome) {
       String addr = DcHelper.get(this, "addr");
       loginSuccessText.setText(R.string.set_name_and_avatar_explain);
diff --git a/src/main/res/layout/profile_create_activity.xml b/src/main/res/layout/profile_create_activity.xml
index 4bebd6258..c1fd2cdf5 100644
--- a/src/main/res/layout/profile_create_activity.xml
+++ b/src/main/res/layout/profile_create_activity.xml
@@ -2,14 +2,13 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fitsSystemWindows="true"
-    android:background="?attr/colorPrimary"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+  <include layout="@layout/status_bar_background"/>
+
 <org.thoughtcrime.securesms.components.InputAwareLayout
         android:id="@+id/container"
-        android:background="?android:attr/windowBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingTop="20dp"