From d735356feaf8062bf3c6e12d88e81e8c1e78a902 Mon Sep 17 00:00:00 2001
From: Chenxia Liu <liuche@mozilla.com>
Date: Wed, 31 Jul 2013 15:38:47 -0700
Subject: [PATCH] Bug 888553 - Remote Debugging Part 1: Strings and prefs
 layout. r=lucasr

---
 mobile/android/base/Makefile.in                    |  1 +
 .../android/base/locales/en-US/android_strings.dtd |  3 +++
 .../base/resources/xml-v11/preference_headers.xml  |  7 +++++++
 .../android/base/resources/xml-v11/preferences.xml | 10 +++++++++-
 .../resources/xml-v11/preferences_customize.xml    |  2 ++
 .../xml-v11/preferences_customize_tablet.xml       |  3 ++-
 .../android/base/resources/xml/preferences.xml.in  | 13 ++++++++++++-
 .../base/resources/xml/preferences_devtools.xml    | 14 ++++++++++++++
 mobile/android/base/strings.xml.in                 |  3 +++
 9 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 mobile/android/base/resources/xml/preferences_devtools.xml

diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 62072bcdcfd9..14781e6764bd 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -577,6 +577,7 @@ RES_XML = \
   res/xml/preferences_search.xml \
   res/xml/preferences_privacy.xml \
   res/xml/preferences_vendor.xml \
+  res/xml/preferences_devtools.xml \
   $(SYNC_RES_XML) \
   $(NULL)
 
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index ecc8965a5eb6..71c84fed8af9 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -71,6 +71,8 @@
 <!ENTITY pref_category_vendor "&vendorShortName;">
 <!ENTITY pref_category_datareporting "Data choices">
 <!ENTITY pref_category_installed_search_engines "Installed search engines">
+<!ENTITY pref_category_devtools "Developer tools">
+<!ENTITY pref_developer_remotedebugging "Remote debugging">
 
 <!-- collected old strings - remove after determining final strings
      as part of Bug 877791 -->
@@ -93,6 +95,7 @@
 <!ENTITY pref_header_privacy_short "Privacy">
 <!ENTITY pref_header_help "Help">
 <!ENTITY pref_header_vendor "&vendorShortName;">
+<!ENTITY pref_header_devtools "Developer tools">
 
 <!ENTITY pref_cookies_menu "Cookies">
 <!ENTITY pref_cookies_accept_all "Enabled">
diff --git a/mobile/android/base/resources/xml-v11/preference_headers.xml b/mobile/android/base/resources/xml-v11/preference_headers.xml
index 7ed3eda62f96..ac52bf28c6c3 100644
--- a/mobile/android/base/resources/xml-v11/preference_headers.xml
+++ b/mobile/android/base/resources/xml-v11/preference_headers.xml
@@ -32,4 +32,11 @@
         <extra android:name="resource"
                android:value="preferences_vendor"/>
     </header>
+
+    <header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
+            android:title="@string/pref_header_devtools">
+        <extra android:name="resource"
+               android:value="preferences_devtools"/>
+    </header>
+
 </preference-headers>
diff --git a/mobile/android/base/resources/xml-v11/preferences.xml b/mobile/android/base/resources/xml-v11/preferences.xml
index f2a200a6b72d..02637c689d67 100644
--- a/mobile/android/base/resources/xml-v11/preferences.xml
+++ b/mobile/android/base/resources/xml-v11/preferences.xml
@@ -4,7 +4,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Phone v11+ only: Sync is a top-level menu item.
-     See xml-v11/preference_headers.xml for tablet layout. -->
+     See xml-v11/preference_headers.xml for tablet layout.
+     Preference changes here should be mirrored to xml/preferences.xml.in. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:gecko="http://schemas.android.com/apk/res-auto"
@@ -38,4 +39,11 @@
         <extra android:name="resource"
                android:value="preferences_vendor"/>
     </PreferenceScreen>
+
+    <PreferenceScreen android:title="@string/pref_category_devtools"
+                      android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
+        <extra android:name="resource"
+               android:value="preferences_devtools"/>
+    </PreferenceScreen>
+
 </PreferenceScreen>
diff --git a/mobile/android/base/resources/xml-v11/preferences_customize.xml b/mobile/android/base/resources/xml-v11/preferences_customize.xml
index 3898b575ba7e..c794a17f908c 100644
--- a/mobile/android/base/resources/xml-v11/preferences_customize.xml
+++ b/mobile/android/base/resources/xml-v11/preferences_customize.xml
@@ -3,6 +3,8 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+<!-- Changes should be mirrored to preferences_customize_tablet.xml. -->
+
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:gecko="http://schemas.android.com/apk/res-auto"
                   android:enabled="false">
diff --git a/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml b/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml
index 48f10bdf1768..725c4c49ac55 100644
--- a/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml
+++ b/mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml
@@ -4,7 +4,8 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- Tablet only: The contents under the "Customize" header for tablets,
-     See xml-v11/preferences.xml for single-pane v11+ phone layout. -->
+     See xml-v11/preferences.xml for single-pane v11+ phone layout.
+     Changes to preferences shoudl be mirrored to preferences_customize.xml. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:gecko="http://schemas.android.com/apk/res-auto"
diff --git a/mobile/android/base/resources/xml/preferences.xml.in b/mobile/android/base/resources/xml/preferences.xml.in
index b863dd2678a1..85b9908c5131 100644
--- a/mobile/android/base/resources/xml/preferences.xml.in
+++ b/mobile/android/base/resources/xml/preferences.xml.in
@@ -4,7 +4,9 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!-- Preferences screen for pre-v11 Android devices that do not support PreferenceFragment or ActionBar -->
+<!-- Preferences screen for pre-v11 Android devices that do not support
+     PreferenceFragment or ActionBar. Preference changes here should be mirrored
+     to xml-v11/preferences.xml. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:gecko="http://schemas.android.com/apk/res-auto"
@@ -52,5 +54,14 @@
                 android:value="preferences_vendor" />
         </intent>
     </PreferenceScreen>
+    <PreferenceScreen android:title="@string/pref_category_devtools">
+        <intent android:action="android.intent.action.VIEW"
+                android:targetPackage="@ANDROID_PACKAGE_NAME@"
+                android:targetClass="org.mozilla.gecko.GeckoPreferences" >
+            <extra
+                android:name="resource"
+                android:value="preferences_devtools" />
+        </intent>
+    </PreferenceScreen>
 
 </PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences_devtools.xml b/mobile/android/base/resources/xml/preferences_devtools.xml
new file mode 100644
index 000000000000..6a31bd36b2f6
--- /dev/null
+++ b/mobile/android/base/resources/xml/preferences_devtools.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
+                  android:title="@string/pref_category_devtools"
+                  android:enabled="false">
+
+       <CheckBoxPreference android:key="devtools.debugger.remote-enabled"
+                           android:title="@string/pref_developer_remotedebugging" />
+
+</PreferenceScreen>
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index c39ea22154c9..d4216d1e684c 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -84,11 +84,14 @@
   <string name="pref_category_vendor">&pref_category_vendor;</string>
   <string name="pref_category_datareporting">&pref_category_datareporting;</string>
   <string name="pref_category_installed_search_engines">&pref_category_installed_search_engines;</string>
+  <string name="pref_category_devtools">&pref_category_devtools;</string>
+  <string name="pref_developer_remotedebugging">&pref_developer_remotedebugging;</string>
 
   <string name="pref_header_customize">&pref_header_customize;</string>
   <string name="pref_header_display">&pref_header_display;</string>
   <string name="pref_header_privacy_short">&pref_header_privacy_short;</string>
   <string name="pref_header_vendor">&pref_header_vendor;</string>
+  <string name="pref_header_devtools">&pref_header_devtools;</string>
 
   <string name="pref_remember_signons">&pref_remember_signons;</string>