From 8bcaed90c11e292da199545f701fd44ecb07ec95 Mon Sep 17 00:00:00 2001 From: szymonrybczak Date: Tue, 12 Dec 2023 03:09:53 -0800 Subject: [PATCH] Update profiler button to use "Toggle" string. (#41900) Summary: Fixes https://github.com/facebook/react-native/issues/38192, this issue wasn't fixed properly, cortinico fixed same case but for inspector button. ## Changelog: [ANDROID] [FIXED] - Update profiler button to use "Toggle" string. Pull Request resolved: https://github.com/facebook/react-native/pull/41900 Test Plan: CI Reviewed By: cortinico Differential Revision: D52049181 Pulled By: ryancat fbshipit-source-id: 9225edb3a5a582b879f4ebb835f6ac52cba4c042 --- .../com/facebook/react/devsupport/BridgeDevSupportManager.java | 3 ++- .../ReactAndroid/src/main/res/devsupport/values/strings.xml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java index 79977623cde..e0f831b7a87 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java @@ -14,6 +14,7 @@ import com.facebook.common.logging.FLog; import com.facebook.debug.holder.PrinterHolder; import com.facebook.debug.tags.ReactDebugOverlayTags; import com.facebook.infer.annotation.Assertions; +import com.facebook.react.R; import com.facebook.react.bridge.CatalystInstance; import com.facebook.react.bridge.JSBundleLoader; import com.facebook.react.bridge.JavaJSExecutor; @@ -100,7 +101,7 @@ public final class BridgeDevSupportManager extends DevSupportManagerBase { } addCustomDevOption( - mIsSamplingProfilerEnabled ? "Disable Sampling Profiler" : "Enable Sampling Profiler", + applicationContext.getString(R.string.catalyst_sample_profiler_toggle), new DevOptionHandler() { @Override public void onOptionSelected() { diff --git a/packages/react-native/ReactAndroid/src/main/res/devsupport/values/strings.xml b/packages/react-native/ReactAndroid/src/main/res/devsupport/values/strings.xml index d562be6d686..bc89201b956 100644 --- a/packages/react-native/ReactAndroid/src/main/res/devsupport/values/strings.xml +++ b/packages/react-native/ReactAndroid/src/main/res/devsupport/values/strings.xml @@ -22,8 +22,7 @@ Copy\n Report Loading from %1$s… - Disable Sampling Profiler - Enable Sampling Profiler + Toggle Sampling Profiler React Native Dev Menu (%1$s) Running %1$s