From 9ddd24566dc7db95dbffdf585c896a6f48c7933d Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 3 Apr 2025 12:59:50 -0300 Subject: [PATCH] Fix action mode status bar coloring. --- .../ConversationListFragment.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java index d2026c6cf3..631725129e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java @@ -24,14 +24,11 @@ import android.content.Intent; import android.content.res.ColorStateList; import android.content.res.Configuration; import android.content.res.Resources; -import android.content.res.TypedArray; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.view.LayoutInflater; @@ -173,7 +170,6 @@ import org.thoughtcrime.securesms.util.SignalLocalMetrics; import org.thoughtcrime.securesms.util.SignalProxyUtil; import org.thoughtcrime.securesms.util.SnapToTopDataObserver; import org.thoughtcrime.securesms.util.ViewUtil; -import org.thoughtcrime.securesms.util.WindowUtil; import org.thoughtcrime.securesms.util.adapter.mapping.PagingMappingAdapter; import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask; import org.thoughtcrime.securesms.util.views.SimpleProgressDialog; @@ -1445,22 +1441,6 @@ public class ConversationListFragment extends MainFragment implements ActionMode @Override public void onDestroyActionMode(ActionMode mode) { viewModel.endSelection(); - - TypedArray color = getActivity().getTheme().obtainStyledAttributes(new int[] { android.R.attr.statusBarColor }); - WindowUtil.setStatusBarColor(getActivity().getWindow(), color.getColor(0, Color.BLACK)); - color.recycle(); - - if (Build.VERSION.SDK_INT >= 23) { - TypedArray lightStatusBarAttr = getActivity().getTheme().obtainStyledAttributes(new int[] { android.R.attr.windowLightStatusBar }); - int current = getActivity().getWindow().getDecorView().getSystemUiVisibility(); - int statusBarMode = lightStatusBarAttr.getBoolean(0, false) ? current | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR - : current & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; - - getActivity().getWindow().getDecorView().setSystemUiVisibility(statusBarMode); - - lightStatusBarAttr.recycle(); - } - endActionModeIfActive(); }