Merge pull request #25806 from lissyx/bug1093602

Bug 1093602 - Remove LogShake feature from v2.1 r=janx
mozilla-b2g · Nov 4, 2014 · 57b111f · 57b111f
2 parents 9d80d55 + c5386c6
commit 57b111f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 239 deletions.
diff --git a/apps/settings/elements/developer.html b/apps/settings/elements/developer.html
@@ -205,12 +205,6 @@ <h2 data-l10n-id="debug">Debug</h2>
             <span data-l10n-id="use-reviewer-certs">Use Marketplace reviewer certs</span>
           </label>
         </li>
-        <li>
-          <label class="pack-checkbox">
-            <input type="checkbox" name="devtools.logshake">
-            <span data-l10n-id="shake-to-log">Shake to save system log</span>
-          </label>
-        </li>
         <li>
           <label class="pack-checkbox">
             <input type="checkbox" name="debug.verbose_app_permissions">

diff --git a/apps/system/index.html b/apps/system/index.html
@@ -418,7 +418,6 @@
 
     <!-- Developer Tools -->
     <script defer src="js/remote_debugger.js"></script>
-    <script defer src="js/devtools/logshake.js"></script>
     <script defer src="js/devtools/developer_hud.js"></script>
     <link rel="stylesheet" type="text/css" href="style/devtools/developer_hud.css">
 

diff --git a/apps/system/js/devtools/logshake.js b/apps/system/js/devtools/logshake.js
diff --git a/apps/system/jsdoc.json b/apps/system/jsdoc.json
@@ -6,7 +6,6 @@
             "!apps/system/js/app_install_manager.js",
             "!apps/system/js/app_usage_metrics.js",
             "!apps/system/js/app_window_manager.js",
-            "!apps/system/js/devtools/logshake.js",
             "!apps/system/js/lockscreen.js",
             "!apps/system/js/lockscreen_notification_builder.js",
             "!apps/system/js/lockscreen_notifications.js",

diff --git a/apps/system/test/unit/logshake_test.js b/apps/system/test/unit/logshake_test.js