From 31eea8eee3bd904065b06c639321dbc2cea1ca55 Mon Sep 17 00:00:00 2001
From: Siqi Liu <siqiliu@fb.com>
Date: Tue, 31 May 2016 07:44:29 -0700
Subject: [PATCH] Android Dev Menu Options Reorder and Relabel

Summary:
Just rename and rearrange the dev menu options in Android, so as to be consistent with those in iOS.

{F61192593}                          {F61192595}

{F61192594}                          {F61192597}

There are other issues to solve on the inspector and profiling in Android, so I just ignore them for now.

Reviewed By: mkonicek

Differential Revision: D3361415

fbshipit-source-id: ffa823a0c54a27f7918e4e43ecea3c845d2a2f90
---
 .../devsupport/DevSupportManagerImpl.java     | 40 +++++++++----------
 .../main/res/devsupport/values/strings.xml    |  8 ++--
 2 files changed, 24 insertions(+), 24 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 55057a8ed..ee4a7f3a6 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerImpl.java
@@ -274,6 +274,16 @@ public class DevSupportManagerImpl implements DevSupportManager {
             handleReloadJS();
           }
         });
+    options.put(
+      mDevSettings.isReloadOnJSChangeEnabled()
+        ? mApplicationContext.getString(R.string.catalyst_live_reload_off)
+        : mApplicationContext.getString(R.string.catalyst_live_reload),
+      new DevOptionHandler() {
+        @Override
+        public void onOptionSelected() {
+          mDevSettings.setReloadOnJSChangeEnabled(!mDevSettings.isReloadOnJSChangeEnabled());
+        }
+      });
     options.put(
             mDevSettings.isHotModuleReplacementEnabled()
                     ? mApplicationContext.getString(R.string.catalyst_hot_module_replacement_off)
@@ -285,16 +295,6 @@ public class DevSupportManagerImpl implements DevSupportManager {
                 handleReloadJS();
               }
             });
-    options.put(
-        mDevSettings.isReloadOnJSChangeEnabled()
-            ? mApplicationContext.getString(R.string.catalyst_live_reload_off)
-            : mApplicationContext.getString(R.string.catalyst_live_reload),
-        new DevOptionHandler() {
-          @Override
-          public void onOptionSelected() {
-            mDevSettings.setReloadOnJSChangeEnabled(!mDevSettings.isReloadOnJSChangeEnabled());
-          }
-        });
     options.put(
       mApplicationContext.getString(R.string.catalyst_element_inspector),
         new DevOptionHandler() {
@@ -304,6 +304,16 @@ public class DevSupportManagerImpl implements DevSupportManager {
             mReactInstanceCommandsHandler.toggleElementInspector();
           }
         });
+    options.put(
+      mDevSettings.isFpsDebugEnabled()
+        ? mApplicationContext.getString(R.string.catalyst_perf_monitor_off)
+        : mApplicationContext.getString(R.string.catalyst_perf_monitor),
+      new DevOptionHandler() {
+        @Override
+        public void onOptionSelected() {
+          mDevSettings.setFpsDebugEnabled(!mDevSettings.isFpsDebugEnabled());
+        }
+      });
     options.put(
         mApplicationContext.getString(R.string.catalyst_heap_capture),
         new DevOptionHandler() {
@@ -323,16 +333,6 @@ public class DevSupportManagerImpl implements DevSupportManager {
             }
           }
         });
-    options.put(
-        mDevSettings.isFpsDebugEnabled()
-            ? mApplicationContext.getString(R.string.catalyst_perf_monitor_off)
-            : mApplicationContext.getString(R.string.catalyst_perf_monitor),
-        new DevOptionHandler() {
-          @Override
-          public void onOptionSelected() {
-            mDevSettings.setFpsDebugEnabled(!mDevSettings.isFpsDebugEnabled());
-          }
-        });
     if (mCurrentContext != null &&
         mCurrentContext.getCatalystInstance() != null &&
         !mCurrentContext.getCatalystInstance().isDestroyed() &&
diff --git a/ReactAndroid/src/main/res/devsupport/values/strings.xml b/ReactAndroid/src/main/res/devsupport/values/strings.xml
index 9fe01dbda..dda73a8c5 100644
--- a/ReactAndroid/src/main/res/devsupport/values/strings.xml
+++ b/ReactAndroid/src/main/res/devsupport/values/strings.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="catalyst_reloadjs" project="catalyst" translatable="false">Reload JS</string>
+  <string name="catalyst_reloadjs" project="catalyst" translatable="false">Reload</string>
   <string name="catalyst_debugjs" project="catalyst" translatable="false">Debug JS Remotely</string>
-  <string name="catalyst_debugjs_off" project="catalyst" translatable="false">Stop Remote JS Debugging</string>
+  <string name="catalyst_debugjs_off" project="catalyst" translatable="false">Disable Remote JS Debugging</string>
   <string name="catalyst_hot_module_replacement" project="catalyst" translatable="false">Enable Hot Reloading</string>
   <string name="catalyst_hot_module_replacement_off" project="catalyst" translatable="false">Disable Hot Reloading</string>
   <string name="catalyst_live_reload" project="catalyst" translatable="false">Enable Live Reload</string>
   <string name="catalyst_live_reload_off" project="catalyst" translatable="false">Disable Live Reload</string>
-  <string name="catalyst_perf_monitor" project="catalyst" translatable="false">Enable Perf Monitor</string>
-  <string name="catalyst_perf_monitor_off" project="catalyst" translatable="false">Disable Perf Monitor</string>
+  <string name="catalyst_perf_monitor" project="catalyst" translatable="false">Show Perf Monitor</string>
+  <string name="catalyst_perf_monitor_off" project="catalyst" translatable="false">Hide Perf Monitor</string>
   <string name="catalyst_settings" project="catalyst" translatable="false">Dev Settings</string>
   <string name="catalyst_settings_title" project="catalyst" translatable="false">Catalyst Dev Settings</string>
   <string name="catalyst_jsload_title" project="catalyst" translatable="false">Please wait…</string>