Update part 2: updating for Android 15 (sdk 35) compatibility

PasscodeLock/src/main/java/org/wordpress/passcodelock/PasscodeManagePasswordActivity.java

@@ -1,12 +1,15 @@
 package org.wordpress.passcodelock;
 
 import android.annotation.SuppressLint;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
 
 import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
 import androidx.core.os.CancellationSignal;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 
 public class PasscodeManagePasswordActivity extends AbstractPasscodeKeyboardActivity {
     public static final String  KEY_TYPE = "type";
@@ -17,6 +20,23 @@ public class PasscodeManagePasswordActivity extends AbstractPasscodeKeyboardActi
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        // Setup edge-to-edge display for Android 15+ compatibility
+        // This is a fullscreen passcode activity without toolbar
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+            WindowInsetsControllerCompat controller = WindowCompat.getInsetsController(
+                getWindow(), 
+                getWindow().getDecorView()
+            );
+
+            if (controller != null) {
+                // Dark status bar appearance for the passcode screen background
+                controller.setAppearanceLightStatusBars(false);
+                controller.setAppearanceLightNavigationBars(false);
+            }
+        }
 
         Bundle extras = getIntent().getExtras();
         if (extras != null) {

PasscodeLock/src/main/res/layout/app_passcode_keyboard.xml

@@ -6,10 +6,11 @@
     android:background="@color/passcodelock_background"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
+    android:fitsSystemWindows="false"
     android:paddingBottom="24dp"
     android:paddingLeft="24dp"
     android:paddingRight="24dp"
-    android:paddingTop="32dp">
+    android:paddingTop="?attr/actionBarSize">
 
     <TextView
         android:id="@+id/passcodelock_prompt"

Simplenote/build.gradle

@@ -41,7 +41,7 @@ android {
         versionCode versionProperties.getProperty("versionCode").toInteger()
 
         minSdkVersion 23
-        targetSdkVersion 34
+        targetSdkVersion 35
     }
 
 

Simplenote/src/main/AndroidManifest.xml

@@ -164,7 +164,8 @@
             android:name="com.automattic.simplenote.PreferencesActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="Preferences"
-            android:parentActivityName=".NotesActivity">
+            android:parentActivityName=".NotesActivity"
+            android:theme="@style/Theme.Simplestyle">
         </activity>
 
         <activity

Simplenote/src/main/java/com/automattic/simplenote/AboutActivity.java

@@ -8,6 +8,7 @@
 import androidx.appcompat.widget.Toolbar;
 
 import com.automattic.simplenote.utils.DrawableUtils;
+import com.automattic.simplenote.utils.SystemBarUtils;
 
 public class AboutActivity extends AppCompatActivity {
     @Override
@@ -24,6 +25,17 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 this, R.drawable.ic_cross_24dp, android.R.color.white
             ));
         }
+
+        // Setup edge-to-edge display with proper WindowInsets handling
+        // AboutActivity has a dark theme with blue background, so use appropriate appearance
+        SystemBarUtils.setupEdgeToEdgeWithToolbar(
+            this,
+            findViewById(R.id.main_parent_view),
+            toolbar,
+            findViewById(R.id.about_fragment),
+            false, // Dark status bar icons for blue background
+            false  // Dark navigation bar icons for blue background
+        );
     }
 
     @Override

Simplenote/src/main/java/com/automattic/simplenote/AddTagActivity.kt

@@ -1,5 +1,6 @@
 package com.automattic.simplenote
 
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.text.method.LinkMovementMethod
@@ -10,10 +11,13 @@ import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.widget.doAfterTextChanged
 import com.automattic.simplenote.databinding.ActivityTagAddBinding
 import com.automattic.simplenote.utils.DisplayUtils
 import com.automattic.simplenote.utils.HtmlCompat
+import com.automattic.simplenote.utils.SystemBarUtils
 import com.automattic.simplenote.utils.ThemeUtils
 import com.automattic.simplenote.viewmodels.AddTagViewModel
 import com.automattic.simplenote.widgets.MorphCircleToRectangle
@@ -27,15 +31,29 @@ class AddTagActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         ThemeUtils.setTheme(this)
         super.onCreate(savedInstanceState)
-        val binding: ActivityTagAddBinding = ActivityTagAddBinding.inflate(layoutInflater)
 
-        binding.setObservers()
-        binding.setupLayout()
-        binding.setupViews()
+        with(ActivityTagAddBinding.inflate(layoutInflater)) {
+            setContentView(root)
+            setupLayout()
+            setupViews()
+            setObservers()
 
-        viewModel.start()
+            viewModel.start()
+
+
+            // Setup edge-to-edge display with proper WindowInsets handling
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                SystemBarUtils.setupEdgeToEdgeWithAutoTheming(this@AddTagActivity, root, null, null)
+            }
+
+            // Add minimal IME (keyboard) insets handling for dialog positioning
+            ViewCompat.setOnApplyWindowInsetsListener(root) { view, insets ->
+                val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime())
+                view.setPadding(view.paddingLeft, view.paddingTop, view.paddingRight, imeInsets.bottom)
+                insets
+            }
+        }
 
-        setContentView(binding.root)
     }
 
     private fun ActivityTagAddBinding.setupViews() {

Simplenote/src/main/java/com/automattic/simplenote/CollaboratorsActivity.kt

@@ -13,9 +13,10 @@ import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.automattic.simplenote.databinding.ActivityCollaboratorsBinding
 import com.automattic.simplenote.utils.CollaboratorsAdapter
-import com.automattic.simplenote.utils.CollaboratorsAdapter.*
 import com.automattic.simplenote.utils.CollaboratorsAdapter.CollaboratorDataItem.*
+import com.automattic.simplenote.utils.DisplayUtils
 import com.automattic.simplenote.utils.IntentUtils
+import com.automattic.simplenote.utils.SystemBarUtils
 import com.automattic.simplenote.utils.toast
 import com.automattic.simplenote.viewmodels.CollaboratorsViewModel
 import com.automattic.simplenote.viewmodels.CollaboratorsViewModel.Event
@@ -47,6 +48,16 @@ class CollaboratorsActivity : ThemedAppCompatActivity() {
             setObservers()
 
             viewModel.loadCollaborators(noteId)
+
+            // Setup edge-to-edge display with proper WindowInsets handling
+            // Use auto-theming to properly handle status bar appearance based on theme
+            val toolbar = findViewById<Toolbar>(R.id.toolbar)
+            SystemBarUtils.setupEdgeToEdgeWithAutoTheming(
+                this@CollaboratorsActivity,
+                findViewById(R.id.main_parent_view),
+                toolbar,
+                collaboratorsList
+            )
         }
     }
 
@@ -79,6 +90,9 @@ class CollaboratorsActivity : ThemedAppCompatActivity() {
         collaboratorsList.setEmptyView(empty.root)
 
         buttonAddCollaborator.setOnClickListener { viewModel.clickAddCollaborator() }
+        buttonAddCollaborator.setOnApplyWindowInsetsListener { view, insets ->
+            DisplayUtils.applyWindowInsetsForFloatingActionButton(insets, resources, view)
+        }
 
         empty.image.setImageResource(R.drawable.ic_collaborate_24dp)
         empty.title.text = getString(R.string.no_collaborators)

Simplenote/src/main/java/com/automattic/simplenote/NoteEditorActivity.java

@@ -36,6 +36,7 @@
 import com.automattic.simplenote.utils.DisplayUtils;
 import com.automattic.simplenote.utils.IntentUtils;
 import com.automattic.simplenote.utils.NetworkUtils;
+import com.automattic.simplenote.utils.SystemBarUtils;
 import com.automattic.simplenote.utils.WidgetUtils;
 import com.automattic.simplenote.widgets.NoteEditorViewPager;
 import com.automattic.simplenote.widgets.RobotoMediumTextView;
@@ -230,6 +231,15 @@ public void onPageScrollStateChanged(int state) {
                 "note_list_widget_note_tapped"
             );
         }
+
+        // Setup edge-to-edge display with proper WindowInsets handling
+        // Use auto-theming to properly handle status bar appearance based on theme
+        SystemBarUtils.setupEdgeToEdgeWithAutoTheming(
+            this,
+            findViewById(R.id.main_parent_view),
+            toolbar,
+            findViewById(R.id.pager)
+        );
     }
 
     @Override

Simplenote/src/main/java/com/automattic/simplenote/NoteEditorFragment.java

@@ -82,6 +82,7 @@
 import com.automattic.simplenote.utils.TagsMultiAutoCompleteTextView;
 import com.automattic.simplenote.utils.TagsMultiAutoCompleteTextView.OnTagAddedListener;
 import com.automattic.simplenote.utils.TextHighlighter;
+import com.automattic.simplenote.utils.SystemBarUtils;
 import com.automattic.simplenote.utils.ThemeUtils;
 import com.automattic.simplenote.utils.WidgetUtils;
 import com.automattic.simplenote.viewmodels.NoteEditorViewModel;
@@ -204,7 +205,7 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
                 DrawableUtils.tintMenuWithAttribute(getActivity(), menu, R.attr.toolbarIconColor);
             }
 
-            requireActivity().getWindow().setStatusBarColor(ThemeUtils.getColorFromAttribute(requireContext(), R.attr.mainBackgroundColor));
+            SystemBarUtils.setStatusBarColor(requireActivity(), ThemeUtils.getColorFromAttribute(requireContext(), R.attr.mainBackgroundColor));
             return true;
         }
 
@@ -279,7 +280,7 @@ public void onDestroyActionMode(ActionMode mode) {
             }
 
             new Handler().postDelayed(
-                    () -> requireActivity().getWindow().setStatusBarColor(
+                    () -> SystemBarUtils.setStatusBarColor(requireActivity(),
                             getResources().getColor(android.R.color.transparent, requireActivity().getTheme())),
                 requireContext().getResources().getInteger(android.R.integer.config_mediumAnimTime)
             );

Simplenote/src/main/java/com/automattic/simplenote/NoteListFragment.java

@@ -80,6 +80,7 @@
 import com.automattic.simplenote.utils.SimplenoteLinkify;
 import com.automattic.simplenote.utils.StrUtils;
 import com.automattic.simplenote.utils.TextHighlighter;
+import com.automattic.simplenote.utils.SystemBarUtils;
 import com.automattic.simplenote.utils.ThemeUtils;
 import com.automattic.simplenote.utils.WidgetUtils;
 import com.automattic.simplenote.widgets.RobotoRegularTextView;
@@ -193,7 +194,7 @@ public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
         inflater.inflate(R.menu.bulk_edit, menu);
         DrawableUtils.tintMenuWithAttribute(getActivity(), menu, R.attr.actionModeTextColor);
         mActionMode = actionMode;
-        requireActivity().getWindow().setStatusBarColor(ThemeUtils.getColorFromAttribute(requireContext(), R.attr.mainBackgroundColor));
+        SystemBarUtils.setStatusBarColor(requireActivity(), ThemeUtils.getColorFromAttribute(requireContext(), R.attr.mainBackgroundColor));
         return true;
     }
 
@@ -304,7 +305,7 @@ public void onDestroyActionMode(ActionMode mode) {
             new Runnable() {
                 @Override
                 public void run() {
-                    requireActivity().getWindow().setStatusBarColor(getResources().getColor(android.R.color.transparent, requireActivity().getTheme()));
+                    SystemBarUtils.setStatusBarColor(requireActivity(), getResources().getColor(android.R.color.transparent, requireActivity().getTheme()));
                 }
             },
             requireContext().getResources().getInteger(android.R.integer.config_longAnimTime)

Simplenote/src/main/java/com/automattic/simplenote/PreferencesActivity.java

@@ -2,13 +2,15 @@
 
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Toast;
 
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 
 import com.automattic.simplenote.utils.BrowserUtils;
+import com.automattic.simplenote.utils.SystemBarUtils;
 
 import org.wordpress.passcodelock.PasscodePreferenceFragment;
 import org.wordpress.passcodelock.PasscodePreferenceFragmentCompat;
@@ -56,6 +58,15 @@ protected void onCreate(Bundle savedInstanceState) {
             mPreferencesFragment = (PreferencesFragment) fragmentManager.findFragmentByTag(preferencesTag);
             mPasscodePreferenceFragment = (PasscodePreferenceFragmentCompat) fragmentManager.findFragmentByTag(passcodeTag);
         }
+
+        // Setup edge-to-edge display with proper WindowInsets handling
+        // Use auto-theming to properly handle status bar appearance based on theme
+        SystemBarUtils.setupEdgeToEdgeWithAutoTheming(
+            this,
+            findViewById(R.id.main_parent_view),
+            toolbar,
+            findViewById(R.id.preferences_container)
+        );
     }
 
     @Override

Simplenote/src/main/java/com/automattic/simplenote/TagsActivity.kt

@@ -16,6 +16,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.automattic.simplenote.databinding.ActivityTagsBinding
 import com.automattic.simplenote.utils.*
+import com.automattic.simplenote.utils.SystemBarUtils
 import com.automattic.simplenote.viewmodels.TagsEvent
 import com.automattic.simplenote.viewmodels.TagsEvent.*
 import com.automattic.simplenote.viewmodels.TagsViewModel
@@ -36,6 +37,16 @@ class TagsActivity : ThemedAppCompatActivity() {
         binding.setObservers()
 
         viewModel.start()
+
+        // Setup edge-to-edge display with proper WindowInsets handling
+        // Use auto-theming to properly handle status bar appearance based on theme
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        SystemBarUtils.setupEdgeToEdgeWithAutoTheming(
+            this,
+            findViewById(R.id.main_parent_view),
+            toolbar,
+            binding.list
+        )
     }
 
     private fun ActivityTagsBinding.setupViews() {
@@ -62,6 +73,9 @@ class TagsActivity : ThemedAppCompatActivity() {
             viewModel.longClickAddTag()
             true
         }
+        buttonAdd.setOnApplyWindowInsetsListener { view, insets ->
+            DisplayUtils.applyWindowInsetsForFloatingActionButton(insets, resources, view)
+        }
     }
 
     private fun ActivityTagsBinding.setObservers() {

Simplenote/src/main/java/com/automattic/simplenote/authentication/SimplenoteAuthenticationActivity.java

@@ -4,13 +4,18 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
@@ -20,6 +25,7 @@
 import com.automattic.simplenote.analytics.AnalyticsTracker;
 import com.automattic.simplenote.utils.IntentUtils;
 import com.automattic.simplenote.utils.StrUtils;
+import com.automattic.simplenote.utils.SystemBarUtils;
 import com.automattic.simplenote.utils.WordPressUtils;
 import com.automattic.simplenote.viewmodels.MagicLinkUiState;
 import com.automattic.simplenote.viewmodels.CompleteMagicLinkViewModel;
@@ -59,6 +65,28 @@ public class SimplenoteAuthenticationActivity extends AuthenticationActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        // Setup edge-to-edge display only on Android 15+ to avoid breaking existing theming
+        // Since this extends Simperium's AuthenticationActivity, we need to be conservative
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+            SystemBarUtils.setSystemBarsAppearance(this, true, true); // Dark icons on light background
+
+            // Apply navigation bar insets to avoid button overlap with 3-button navigation
+            ViewCompat.setOnApplyWindowInsetsListener(findViewById(android.R.id.content), (v, windowInsets) -> {
+                Insets systemBars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+
+                // Apply bottom padding to avoid navigation bar overlap
+                v.setPadding(
+                    v.getPaddingLeft(),
+                    v.getPaddingTop(),
+                    v.getPaddingRight(),
+                    systemBars.bottom
+                );
+
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
 
         final Intent intent = getIntent();