dimagi · avazirna · Sep 19, 2025 · Aug 18, 2025 · Aug 18, 2025 · Aug 18, 2025
diff --git a/app/res/values/themes.xml b/app/res/values/themes.xml
@@ -38,8 +38,6 @@
         <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
         <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
 
-        <!-- Opt-out of edge-to-edge enforcement for Android 15 -->
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 
     <style name="AppBaseTheme" parent="CommonTheme" />

diff --git a/app/src/org/commcare/activities/CommCareActivity.java b/app/src/org/commcare/activities/CommCareActivity.java
@@ -36,11 +36,9 @@
 
 import org.commcare.CommCareApplication;
 import org.commcare.android.database.user.models.ACase;
-import org.commcare.connect.PersonalIdManager;
 import org.commcare.fragments.BreadcrumbBarHelper;
 import org.commcare.fragments.ContainerViewModel;
 import org.commcare.fragments.TaskConnectorViewModel;
-import org.commcare.google.services.analytics.AnalyticsParamValue;
 import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.commcare.interfaces.WithUIController;
 import org.commcare.logic.DetailCalloutListenerDefaultImpl;
@@ -75,8 +73,6 @@
 
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
 
 /**
  * Base class for CommCareActivities to simplify
@@ -85,7 +81,7 @@
  * @author ctsims
  */
 
-public abstract class CommCareActivity<R> extends AppCompatActivity
+public abstract class CommCareActivity<R> extends CommonBaseActivity
         implements CommCareTaskConnector<R>, DialogController, OnGestureListener, DetailCalloutListener {
 
     private static final String TAG = CommCareActivity.class.getSimpleName();

diff --git a/app/src/org/commcare/activities/CommCarePreferenceActivity.java b/app/src/org/commcare/activities/CommCarePreferenceActivity.java
@@ -1,7 +1,6 @@
 package org.commcare.activities;
 
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
 
@@ -19,7 +18,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 
-public class CommCarePreferenceActivity extends AppCompatActivity {
+public class CommCarePreferenceActivity extends CommonBaseActivity {
 
     public static final String EXTRA_PREF_TYPE = "extra_pref_type";
 

diff --git a/app/src/org/commcare/activities/CommcareListActivity.java b/app/src/org/commcare/activities/CommcareListActivity.java
@@ -1,6 +1,5 @@
 package org.commcare.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
@@ -13,7 +12,7 @@
 /**
  * An AppCompat compatible implemenation for Android's {@link android.app.ListActivity} class
  */
-public class CommcareListActivity extends AppCompatActivity {
+public class CommcareListActivity extends CommonBaseActivity {
 
     protected ListAdapter mAdapter;
     protected ListView mListView;

diff --git a/app/src/org/commcare/activities/CommonBaseActivity.java b/app/src/org/commcare/activities/CommonBaseActivity.java
@@ -0,0 +1,23 @@
+package org.commcare.activities;
+
+import android.os.Build;
+import android.os.Bundle;
+
+import org.commcare.utils.AndroidUtil;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.WindowInsetsControllerCompat;
+
+public class CommonBaseActivity extends AppCompatActivity {
+    @Override
+    public void onPostCreate(@Nullable Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+            WindowInsetsControllerCompat controller = new WindowInsetsControllerCompat(getWindow(), getWindow().getDecorView());
+            controller.setAppearanceLightStatusBars(true);
+
+            AndroidUtil.attachWindowInsetsListener(this, android.R.id.content);
+        }
+    }
+}
diff --git a/app/src/org/commcare/activities/CrashWarningActivity.java b/app/src/org/commcare/activities/CrashWarningActivity.java
@@ -1,6 +1,5 @@
 package org.commcare.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -19,7 +18,7 @@
  *
  * @author Phillip Mates (pmates@dimagi.com)
  */
-public class CrashWarningActivity extends AppCompatActivity {
+public class CrashWarningActivity extends CommonBaseActivity {
     private int errorMessageVisibility = View.GONE;
     private static final String ERROR_VISIBLE = "error-message-is-visible";
 

diff --git a/app/src/org/commcare/activities/DataChangeLogsActivity.java b/app/src/org/commcare/activities/DataChangeLogsActivity.java
@@ -1,7 +1,6 @@
 package org.commcare.activities;
 
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -12,11 +11,9 @@
 import org.commcare.views.CommCareShareActionProvider;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.MenuItemCompat;
 
-public class DataChangeLogsActivity extends AppCompatActivity {
+public class DataChangeLogsActivity extends CommonBaseActivity {
 
 
     private CommCareShareActionProvider mShareActionProvider;

diff --git a/app/src/org/commcare/activities/DotsEntryActivity.java b/app/src/org/commcare/activities/DotsEntryActivity.java
@@ -1,6 +1,5 @@
 package org.commcare.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
@@ -39,7 +38,7 @@
 /**
  * @author ctsims
  */
-public class DotsEntryActivity extends AppCompatActivity implements DotsEditListener, AnimationListener {
+public class DotsEntryActivity extends CommonBaseActivity implements DotsEditListener, AnimationListener {
 
     private DotsData dotsData;
 

diff --git a/app/src/org/commcare/activities/DrawActivity.java b/app/src/org/commcare/activities/DrawActivity.java
@@ -41,7 +41,7 @@
  *
  * @author BehrAtherton@gmail.com
  */
-public class DrawActivity extends AppCompatActivity implements DrawView.Callback {
+public class DrawActivity extends CommonBaseActivity implements DrawView.Callback {
     private static final String t = "DrawActivity";
 
     public static final String OPTION = "option";
@@ -82,7 +82,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
+        getSupportActionBar().hide();
         Bundle extras = getIntent().getExtras();
 
         if (extras == null) {

diff --git a/app/src/org/commcare/activities/GeoPointActivity.java b/app/src/org/commcare/activities/GeoPointActivity.java
@@ -33,13 +33,12 @@
 import java.text.DecimalFormat;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 
 /**
  * Activity that blocks user until the current GPS location is captured
  */
-public class GeoPointActivity extends AppCompatActivity implements TimerListener, CommCareLocationListener, RuntimePermissionRequester {
+public class GeoPointActivity extends CommonBaseActivity implements TimerListener, CommCareLocationListener, RuntimePermissionRequester {
 
     private GeoProgressDialog locationDialog;
     private Location location;

diff --git a/app/src/org/commcare/activities/GeoPointMapActivity.java b/app/src/org/commcare/activities/GeoPointMapActivity.java
@@ -1,7 +1,6 @@
 package org.commcare.activities;
 
 import android.Manifest;
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -16,7 +15,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.fasterxml.jackson.databind.type.MapType;
 import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
@@ -46,7 +44,7 @@
 /**
  * Allows location to be chosen using a map instead of current gps coordinates
  */
-public class GeoPointMapActivity extends AppCompatActivity
+public class GeoPointMapActivity extends CommonBaseActivity
         implements LocationListener, OnMapReadyCallback,
         GoogleMap.OnMyLocationButtonClickListener {
 

diff --git a/app/src/org/commcare/activities/GlobalPrivilegeClaimingActivity.java b/app/src/org/commcare/activities/GlobalPrivilegeClaimingActivity.java
@@ -1,6 +1,5 @@
 package org.commcare.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.core.app.ActivityCompat;
@@ -15,7 +14,6 @@
 import com.google.zxing.BarcodeFormat;
 
 import org.commcare.dalvik.R;
-import org.commcare.google.services.analytics.AnalyticsParamValue;
 import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.commcare.modern.util.Pair;
 import org.commcare.preferences.GlobalPrivilegesManager;
@@ -32,7 +30,7 @@
  *
  * @author Aliza Stone (astone@dimagi.com), created 6/9/16.
  */
-public class GlobalPrivilegeClaimingActivity extends AppCompatActivity {
+public class GlobalPrivilegeClaimingActivity extends CommonBaseActivity {
 
     private static final String TAG = GlobalPrivilegeClaimingActivity.class.getSimpleName();
 

diff --git a/app/src/org/commcare/activities/SeatAppActivity.java b/app/src/org/commcare/activities/SeatAppActivity.java
@@ -1,6 +1,5 @@
 package org.commcare.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -19,7 +18,7 @@
  *
  * @author amstone
  */
-public class SeatAppActivity extends AppCompatActivity {
+public class SeatAppActivity extends CommonBaseActivity {
 
     private static final String KEY_IN_PROGRESS = "initialization_in_progress";
     public final static String KEY_APP_TO_SEAT = "app_to_seat";

diff --git a/app/src/org/commcare/activities/TargetMismatchErrorActivity.java b/app/src/org/commcare/activities/TargetMismatchErrorActivity.java
@@ -12,9 +12,8 @@
 import org.commcare.utils.StringUtils;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 
-public class TargetMismatchErrorActivity extends AppCompatActivity {
+public class TargetMismatchErrorActivity extends CommonBaseActivity {
 
     private static final String PACKAGE_LTS = "org.commcare.lts";
     private static final String PACKAGE_CC = "org.commcare.dalvik";

diff --git a/app/src/org/commcare/activities/UnrecoverableErrorActivity.java b/app/src/org/commcare/activities/UnrecoverableErrorActivity.java
@@ -8,12 +8,10 @@
 import org.commcare.views.dialogs.StandardAlertDialog;
 import org.javarosa.core.services.locale.Localization;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 /**
  * @author ctsims
  */
-public class UnrecoverableErrorActivity extends AppCompatActivity {
+public class UnrecoverableErrorActivity extends CommonBaseActivity {
 
     public static final String EXTRA_ERROR_TITLE = "UnrecoverableErrorActivity_Title";
     public static final String EXTRA_ERROR_MESSAGE = "UnrecoverableErrorActivity_Message";

diff --git a/app/src/org/commcare/activities/connect/PersonalIdCredentialActivity.kt b/app/src/org/commcare/activities/connect/PersonalIdCredentialActivity.kt
@@ -1,20 +1,21 @@
 package org.commcare.activities.connect
 
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.tabs.TabLayoutMediator
+import org.commcare.activities.CommonBaseActivity
 import org.commcare.activities.connect.viewmodel.PersonalIdCredentialViewModel
 import org.commcare.adapters.CredentialsViewPagerAdapter
 import org.commcare.connect.network.connectId.PersonalIdApiErrorHandler
 import org.commcare.dalvik.R
 import org.commcare.dalvik.databinding.ActivityPersonalIdCredentialBinding
 
-class PersonalIdCredentialActivity : AppCompatActivity() {
+
+class PersonalIdCredentialActivity : CommonBaseActivity() {
+
     private val binding: ActivityPersonalIdCredentialBinding by lazy {
         ActivityPersonalIdCredentialBinding.inflate(layoutInflater)
     }

diff --git a/app/src/org/commcare/android/nfc/NfcActivity.java b/app/src/org/commcare/android/nfc/NfcActivity.java
@@ -11,6 +11,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import org.commcare.activities.CommonBaseActivity;
 import org.commcare.android.logging.ReportingUtils;
 import org.commcare.dalvik.R;
 import org.javarosa.core.services.Logger;
@@ -19,15 +20,14 @@
 import javax.annotation.Nullable;
 
 import androidx.annotation.CallSuper;
-import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Parent activity that provides all of the functionality common to any NFC action that CommCare
  * supports
  *
  * @author Aliza Stone
  */
-public abstract class NfcActivity extends AppCompatActivity {
+public abstract class NfcActivity extends CommonBaseActivity {
 
     protected static final String NFC_PAYLOAD_MULT_TYPES_ARG = "types";
     protected static final String NFC_PAYLOAD_SINGLE_TYPE_ARG = "type";

diff --git a/app/src/org/commcare/fragments/MicroImageActivity.java b/app/src/org/commcare/fragments/MicroImageActivity.java
@@ -23,6 +23,7 @@
 import com.google.mlkit.vision.face.FaceDetector;
 import com.google.mlkit.vision.face.FaceDetectorOptions;
 
+import org.commcare.activities.CommonBaseActivity;
 import org.commcare.dalvik.R;
 import org.commcare.interfaces.RuntimePermissionRequester;
 import org.commcare.util.LogTypes;
@@ -57,7 +58,7 @@
 import androidx.camera.view.PreviewView;
 import androidx.core.content.ContextCompat;
 
-public class MicroImageActivity extends AppCompatActivity implements ImageAnalysis.Analyzer, FaceCaptureView.ImageStabilizedListener, RuntimePermissionRequester {
+public class MicroImageActivity extends CommonBaseActivity implements ImageAnalysis.Analyzer, FaceCaptureView.ImageStabilizedListener, RuntimePermissionRequester {
     public static final String MICRO_IMAGE_BASE_64_RESULT_KEY = "micro_image_base_64_result_key";
     public static final String MICRO_IMAGE_MAX_DIMENSION_PX_EXTRA = "micro_image_max_dimension_px_extra";
     public static final String MICRO_IMAGE_MAX_SIZE_BYTES_EXTRA = "micro_image_max_size_bytes_extra";

diff --git a/app/src/org/commcare/graph/activities/GraphActivity.java b/app/src/org/commcare/graph/activities/GraphActivity.java
@@ -1,18 +1,16 @@
 package org.commcare.graph.activities;
 
-import android.annotation.TargetApi;
 import android.content.pm.ActivityInfo;
-import android.os.Build;
 import android.os.Bundle;
 
-import androidx.appcompat.app.AppCompatActivity;
+import org.commcare.activities.CommonBaseActivity;
 
 /**
  * Full-screen view of a graph.
  *
  * Created by jschweers on 11/20/2015.
  */
-public class GraphActivity extends AppCompatActivity {
+public class GraphActivity extends CommonBaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

diff --git a/app/src/org/commcare/print/TemplatePrinterActivity.java b/app/src/org/commcare/print/TemplatePrinterActivity.java
@@ -1,10 +1,8 @@
 package org.commcare.print;
 
-import android.annotation.TargetApi;
 import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.CancellationSignal;
 import android.os.ParcelFileDescriptor;
@@ -19,6 +17,7 @@
 import android.webkit.WebViewClient;
 
 import org.commcare.CommCareApplication;
+import org.commcare.activities.CommonBaseActivity;
 import org.commcare.android.javarosa.IntentCallout;
 import org.commcare.dalvik.R;
 import org.commcare.preferences.MainConfigurablePreferences;
@@ -45,7 +44,7 @@
  * @author Richard Lu
  * @author amstone
  */
-public class TemplatePrinterActivity extends AppCompatActivity implements PopulateListener {
+public class TemplatePrinterActivity extends CommonBaseActivity implements PopulateListener {
 
     private static final String KEY_TEMPLATE_STYLE = "PRINT_TEMPLATE_STYLE";
     private static final String TEMPLATE_STYLE_HTML = "TEMPLATE_HTML";