Bug 1063128 - Make sure all preferences have keys. r=liuche, a=sledru
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Fri, 05 Sep 2014 15:39:52 -0700
changeset 216778 e981cc82a3e5
parent 216777 3504f727e58c
child 216779 340bddec5bf5
push id3910
push userryanvm@gmail.com
push date2014-09-18 14:48 +0000
treeherdermozilla-beta@af1dbe183e3d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersliuche, sledru
bugs1063128
milestone33.0
Bug 1063128 - Make sure all preferences have keys. r=liuche, a=sledru
mobile/android/base/resources/xml/preferences_devtools.xml
mobile/android/base/resources/xml/preferences_vendor.xml
--- a/mobile/android/base/resources/xml/preferences_devtools.xml
+++ b/mobile/android/base/resources/xml/preferences_devtools.xml
@@ -9,12 +9,14 @@
                   android:enabled="false">
 
        <CheckBoxPreference android:key="nglayout.debug.paint_flashing"
                            android:title="@string/pref_developer_paint_flashing" />
 
        <CheckBoxPreference android:key="devtools.debugger.remote-enabled"
                            android:title="@string/pref_developer_remotedebugging" />
 
-       <org.mozilla.gecko.preferences.AlignRightLinkPreference android:title="@string/pref_learn_more"
+       <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
+                                                               android:title="@string/pref_learn_more"
+                                                               android:persistent="false"
                                                                url="https://developer.mozilla.org/docs/Tools/Remote_Debugging" />
 
 </PreferenceScreen>
--- a/mobile/android/base/resources/xml/preferences_vendor.xml
+++ b/mobile/android/base/resources/xml/preferences_vendor.xml
@@ -3,23 +3,29 @@
    - 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_vendor"
                   android:enabled="false">
 
-    <org.mozilla.gecko.preferences.LinkPreference android:title="@string/pref_about_firefox"
+    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.about.link"
+                                                  android:title="@string/pref_about_firefox"
+                                                  android:persistent="false"
                                                   url="about:" />
 
-    <org.mozilla.gecko.preferences.LinkPreference android:title="@string/pref_vendor_faqs"
+    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.faq.link"
+                                                  android:title="@string/pref_vendor_faqs"
+                                                  android:persistent="false"
                                                   url="https://support.mozilla.org/kb/firefox-android-faq"/>
 
-    <org.mozilla.gecko.preferences.LinkPreference android:title="@string/pref_vendor_feedback"
+    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.feedback.link"
+                                                  android:title="@string/pref_vendor_feedback"
+                                                  android:persistent="false"
                                                   url="about:feedback" />
 
     <PreferenceCategory android:key="android.not_a_preference.datareporting.preferences"
                         android:title="@string/pref_category_datareporting">
 
         <CheckBoxPreference android:key="toolkit.telemetry.enabled"
                             android:title="@string/datareporting_telemetry_title"
                             android:summary="@string/datareporting_telemetry_summary" />
@@ -30,22 +36,24 @@
                             android:defaultValue="false" />
 
         <CheckBoxPreference android:key="app.geo.reportdata"
                             android:title="@string/datareporting_wifi_title"
                             android:summary="@string/datareporting_wifi_geolocation_summary" />
 
         <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.geo.learn_more"
                                                                 android:title="@string/pref_learn_more"
+                                                                android:persistent="false"
                                                                 url="https://location.services.mozilla.com/" />
 
         <CheckBoxPreference android:key="android.not_a_preference.healthreport.uploadEnabled"
                             android:title="@string/datareporting_fhr_title"
                             android:summary="@string/datareporting_fhr_summary2"
                             android:defaultValue="true" />
 
         <org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.healthreport.link"
                                                                 android:title="@string/datareporting_abouthr_title"
+                                                                android:persistent="false"
                                                                 url="about:healthreport" />
 
     </PreferenceCategory>
 
 </PreferenceScreen>