From e91fb05db7f576e07114755b9db1eee91c672f25 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Tue, 15 Jun 2021 18:19:43 -0700 Subject: [PATCH] DevMenu: Change "Toggle Inspector" to Show/Hide Element Inspector Summary: Rationale: - This makes the element inspector button consistent with the Fast Refresh, Perf Monitor and other buttons in the DevMenu - This makes the button more informative Changelog: [Android][Changed] Rename the "Toggle Inspector" DevMenu item to "Hide/Show Element Inspector" Reviewed By: JoshuaGross Differential Revision: D29146871 fbshipit-source-id: 8e8c19217ea2ff2f1d176521aa22200058e7e643 --- .../com/facebook/react/devsupport/DevSupportManagerBase.java | 5 +++-- ReactAndroid/src/main/res/devsupport/values/strings.xml | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java index fdac180aab9322..e0de54893873c5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java @@ -474,8 +474,9 @@ public void onClick(DialogInterface dialog, int which) { }); options.put( - // NOTE: `isElementInspectorEnabled` is not guaranteed to be accurate. - mApplicationContext.getString(R.string.catalyst_inspector), + mDevSettings.isElementInspectorEnabled() + ? mApplicationContext.getString(R.string.catalyst_inspector_stop) + : mApplicationContext.getString(R.string.catalyst_inspector), new DevOptionHandler() { @Override public void onOptionSelected() { diff --git a/ReactAndroid/src/main/res/devsupport/values/strings.xml b/ReactAndroid/src/main/res/devsupport/values/strings.xml index 3571c835e31690..9ebb11b0830bd4 100644 --- a/ReactAndroid/src/main/res/devsupport/values/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values/strings.xml @@ -16,7 +16,8 @@ Disable Fast Refresh Disabling Fast Refresh because it requires a development bundle. Switching to development bundle in order to enable Fast Refresh. - Toggle Inspector + Show Element Inspector + Hide Element Inspector Show Perf Monitor Hide Perf Monitor Settings