From 8e956b3afd2ec8ecfcc6498a99dd878e3de4e041 Mon Sep 17 00:00:00 2001 From: Lulu Wu Date: Mon, 9 Nov 2020 06:42:10 -0800 Subject: [PATCH] Back out "Change StatusBar default style handling strategy" Summary: Original commit changeset: 76e7d0d45fd3 Changelog: [Internal] Reviewed By: makovkastar Differential Revision: D24783092 fbshipit-source-id: 876eaeaffbed63599553456f189f3675aa406e13 --- Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js | 1 - Libraries/Components/StatusBar/StatusBar.js | 2 +- .../com/facebook/react/modules/statusbar/StatusBarModule.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js index b451b90827ed30..5b00b2a4c218a6 100644 --- a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js +++ b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js @@ -55,7 +55,6 @@ const NativeStatusBarManager = { /** * - statusBarStyles can be: * - 'default' - * - 'light-content' * - 'dark-content' */ setStyle(statusBarStyle?: ?string): void { diff --git a/Libraries/Components/StatusBar/StatusBar.js b/Libraries/Components/StatusBar/StatusBar.js index 75b51a082829ef..021e75494d12fa 100644 --- a/Libraries/Components/StatusBar/StatusBar.js +++ b/Libraries/Components/StatusBar/StatusBar.js @@ -25,7 +25,7 @@ import NativeStatusBarManagerIOS from './NativeStatusBarManagerIOS'; */ export type StatusBarStyle = $Keys<{ /** - * Default status bar style (dark for iOS, no change for Android) + * Default status bar style (dark for iOS, light for Android) */ default: string, /** diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java index 44391965e63b31..b4a4e80e68485e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.java @@ -194,7 +194,7 @@ public void run() { int systemUiVisibilityFlags = decorView.getSystemUiVisibility(); if ("dark-content".equals(style)) { systemUiVisibilityFlags |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; - } else if ("light-content".equals(style)) { + } else { systemUiVisibilityFlags &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; } decorView.setSystemUiVisibility(systemUiVisibilityFlags);