[BottomSheet] Add back accidentally removed setLightStatusBar method …

…and annotate it as deprecated PiperOrigin-RevId: 450696352
material-components · May 24, 2022 · 53086a0 · 53086a0
1 parent 66581f2
commit 53086a0
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/lib/java/com/google/android/material/bottomsheet/BottomSheetDialog.java b/lib/java/com/google/android/material/bottomsheet/BottomSheetDialog.java
@@ -19,13 +19,13 @@
 import com.google.android.material.R;
 
 import static com.google.android.material.color.MaterialColors.isColorLight;
-import static com.google.android.material.internal.EdgeToEdgeUtils.setLightStatusBar;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
@@ -49,6 +49,7 @@
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import com.google.android.material.internal.EdgeToEdgeUtils;
 import com.google.android.material.shape.MaterialShapeDrawable;
 
 /**
@@ -484,7 +485,8 @@ private void setPaddingForPosition(View bottomSheet) {
         // If the bottomsheet is light, we should set light status bar so the icons are visible
         // since the bottomsheet is now under the status bar.
         if (window != null) {
-          setLightStatusBar(window, lightBottomSheet == null ? lightStatusBar : lightBottomSheet);
+          EdgeToEdgeUtils.setLightStatusBar(
+              window, lightBottomSheet == null ? lightStatusBar : lightBottomSheet);
         }
         // Smooth transition into status bar when drawing edge to edge.
         bottomSheet.setPadding(
@@ -496,7 +498,7 @@ private void setPaddingForPosition(View bottomSheet) {
         // Reset the status bar icons to the original color because the bottomsheet is not under the
         // status bar.
         if (window != null) {
-          setLightStatusBar(window, lightStatusBar);
+          EdgeToEdgeUtils.setLightStatusBar(window, lightStatusBar);
         }
         bottomSheet.setPadding(
             bottomSheet.getPaddingLeft(),
@@ -506,4 +508,20 @@ private void setPaddingForPosition(View bottomSheet) {
       }
     }
   }
+
+  /**
+   * @deprecated use {@link EdgeToEdgeUtils#setLightStatusBar(Window, boolean)} instead
+   */
+  @Deprecated
+  public static void setLightStatusBar(@NonNull View view, boolean isLight) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      int flags = view.getSystemUiVisibility();
+      if (isLight) {
+        flags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+      } else {
+        flags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+      }
+      view.setSystemUiVisibility(flags);
+    }
+  }
 }