From 47dff23fe4c029fad82521a47903efe0eb30fbfa Mon Sep 17 00:00:00 2001 From: Spencer Ahrens Date: Thu, 21 Apr 2016 16:56:07 -0700 Subject: [PATCH] Change "Hide/Show" Inspector to "Toggle" Summary:The JS and native state can get out of sync if you reload JS while inspecting, so don't even bother trying on native. Reviewed By: lexs Differential Revision: D3203020 fb-gh-sync-id: a3b7294bb0c28c0508f508be53d3ef895a7195b0 fbshipit-source-id: a3b7294bb0c28c0508f508be53d3ef895a7195b0 --- .../com/facebook/react/devsupport/DevSupportManagerImpl.java | 4 +--- .../src/main/res/devsupport/values-en-rGB/strings.xml | 2 +- ReactAndroid/src/main/res/devsupport/values/strings.xml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java index cd85ad64c..087eb6686 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java @@ -296,9 +296,7 @@ public class DevSupportManagerImpl implements DevSupportManager { } }); options.put( - mDevSettings.isElementInspectorEnabled() - ? mApplicationContext.getString(R.string.catalyst_element_inspector_off) - : mApplicationContext.getString(R.string.catalyst_element_inspector), + mApplicationContext.getString(R.string.catalyst_element_inspector), new DevOptionHandler() { @Override public void onOptionSelected() { diff --git a/ReactAndroid/src/main/res/devsupport/values-en-rGB/strings.xml b/ReactAndroid/src/main/res/devsupport/values-en-rGB/strings.xml index de9b5103c..cd1bcc0ce 100644 --- a/ReactAndroid/src/main/res/devsupport/values-en-rGB/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values-en-rGB/strings.xml @@ -12,5 +12,5 @@ Please wait... Fetching JS bundle Unable to download JS bundle - Show Inspector + Toggle Inspector diff --git a/ReactAndroid/src/main/res/devsupport/values/strings.xml b/ReactAndroid/src/main/res/devsupport/values/strings.xml index ea86d0ab9..a685b5ab8 100644 --- a/ReactAndroid/src/main/res/devsupport/values/strings.xml +++ b/ReactAndroid/src/main/res/devsupport/values/strings.xml @@ -16,8 +16,7 @@ Unable to download JS bundle. Did you forget to start the development server or connect your device? Connecting to remote debugger Unable to connect with remote debugger - Show Inspector - Hide Inspector + Toggle Inspector Start Profile Stop Profile