Bug 1401773 - Revert checkboxes->switches changeover for SyncPrefs r=nalexander

MozReview-Commit-ID: 2RwcgomT5UG

--HG--
extra : rebase_source : 92e271fcd2adc328ff9ecdfeb976b679afee0b7e

mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountStatusFragment.java

@@ -13,13 +13,13 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
@@ -99,10 +99,10 @@ public class FxAccountStatusFragment
   protected Preference needsMasterSyncAutomaticallyEnabledPreference;
   protected Preference needsFinishMigratingPreference;
 
-  protected SwitchPreference bookmarksPreference;
-  protected SwitchPreference historyPreference;
-  protected SwitchPreference tabsPreference;
-  protected SwitchPreference passwordsPreference;
+  protected CheckBoxPreference bookmarksPreference;
+  protected CheckBoxPreference historyPreference;
+  protected CheckBoxPreference tabsPreference;
+  protected CheckBoxPreference passwordsPreference;
 
   protected EditTextPreference deviceNamePreference;
   protected Preference syncServerPreference;
@@ -167,10 +167,10 @@ public class FxAccountStatusFragment
     needsMasterSyncAutomaticallyEnabledPreference = ensureFindPreference("needs_master_sync_automatically_enabled");
     needsFinishMigratingPreference = ensureFindPreference("needs_finish_migrating");
 
-    bookmarksPreference = (SwitchPreference) ensureFindPreference("bookmarks");
-    historyPreference = (SwitchPreference) ensureFindPreference("history");
-    tabsPreference = (SwitchPreference) ensureFindPreference("tabs");
-    passwordsPreference = (SwitchPreference) ensureFindPreference("passwords");
+    bookmarksPreference = (CheckBoxPreference) ensureFindPreference("bookmarks");
+    historyPreference = (CheckBoxPreference) ensureFindPreference("history");
+    tabsPreference = (CheckBoxPreference) ensureFindPreference("tabs");
+    passwordsPreference = (CheckBoxPreference) ensureFindPreference("passwords");
 
     profilePreference.setOnPreferenceClickListener(this);
     removeAccountPreference.setOnPreferenceClickListener(this);

mobile/android/services/src/main/res/xml/fxaccount_status_prefscreen.xml

@@ -61,19 +61,19 @@
     <PreferenceCategory
         android:title="@string/fxaccount_status_choose_what">
 
-        <SwitchPreference
+        <CheckBoxPreference
             android:key="bookmarks"
             android:persistent="false"
             android:title="@string/fxaccount_status_bookmarks" />
-        <SwitchPreference
+        <CheckBoxPreference
             android:key="history"
             android:persistent="false"
             android:title="@string/fxaccount_status_history" />
-        <SwitchPreference
+        <CheckBoxPreference
             android:key="tabs"
             android:persistent="false"
             android:title="@string/fxaccount_status_tabs" />
-        <SwitchPreference
+        <CheckBoxPreference
             android:key="passwords"
             android:persistent="false"
             android:title="@string/fxaccount_status_passwords" />