Bug 936522 - Move preference-related to the preferences package (r=li…

…uche)

mobile/android/base/AndroidManifest.xml.in

@@ -239,7 +239,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="org.mozilla.gecko.GeckoPreferences"
+        <activity android:name="org.mozilla.gecko.preferences.GeckoPreferences"
                   android:theme="@style/Gecko.Preferences"
                   android:label="@string/settings_title"
                   android:configChanges="orientation|screenSize"

mobile/android/base/BrowserApp.java

@@ -22,6 +22,7 @@
 import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
 import org.mozilla.gecko.home.SearchEngine;
 import org.mozilla.gecko.menu.GeckoMenu;
+import org.mozilla.gecko.preferences.GeckoPreferences;
 import org.mozilla.gecko.prompts.Prompt;
 import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.GamepadUtils;

mobile/android/base/DataReportingNotification.java

@@ -5,8 +5,8 @@
 
 package org.mozilla.gecko;
 
-import org.mozilla.gecko.GeckoPreferences;
-import org.mozilla.gecko.GeckoPreferenceFragment;
+import org.mozilla.gecko.preferences.GeckoPreferences;
+import org.mozilla.gecko.preferences.GeckoPreferenceFragment;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.app.Notification;

mobile/android/base/GeckoActivity.java

@@ -8,11 +8,6 @@
 import android.content.Intent;
 import android.support.v4.app.FragmentActivity;
 
-interface GeckoActivityStatus {
-    public boolean isGeckoActivityOpened();
-    public boolean isFinishing();  // typically from android.app.Activity
-};
-
 public class GeckoActivity extends FragmentActivity implements GeckoActivityStatus {
     // has this activity recently started another Gecko activity?
     private boolean mGeckoActivityOpened = false;

mobile/android/base/GeckoActivityStatus.java

@@ -0,0 +1,10 @@
+/* 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/. */
+
+package org.mozilla.gecko;
+
+public interface GeckoActivityStatus {
+    public boolean isGeckoActivityOpened();
+    public boolean isFinishing();  // typically from android.app.Activity
+};

mobile/android/base/GeckoApp.java

@@ -18,6 +18,7 @@
 import org.mozilla.gecko.menu.MenuPanel;
 import org.mozilla.gecko.health.BrowserHealthRecorder;
 import org.mozilla.gecko.health.BrowserHealthRecorder.SessionInformation;
+import org.mozilla.gecko.preferences.GeckoPreferences;
 import org.mozilla.gecko.updater.UpdateService;
 import org.mozilla.gecko.updater.UpdateServiceHelper;
 import org.mozilla.gecko.util.ActivityResultHandler;

mobile/android/base/GeckoApplication.java

@@ -54,7 +54,7 @@ public void onReceive(Context context, Intent intent) {
         mInited = true;
     }
 
-    protected void onActivityPause(GeckoActivityStatus activity) {
+    public void onActivityPause(GeckoActivityStatus activity) {
         mInBackground = true;
 
         if ((activity.isFinishing() == false) &&
@@ -79,7 +79,7 @@ public void run() {
         GeckoNetworkManager.getInstance().stop();
     }
 
-    protected void onActivityResume(GeckoActivityStatus activity) {
+    public void onActivityResume(GeckoActivityStatus activity) {
         if (mPausedGecko) {
             GeckoAppShell.sendEventToGecko(GeckoEvent.createAppForegroundingEvent());
             mPausedGecko = false;

mobile/android/base/background/common/GlobalConstants.java.in

@@ -44,7 +44,7 @@ public class GlobalConstants {
   // Fennec's prefs branch and pref name.
   // Eventually Fennec might listen to startup notifications and
   // do this automatically, but this will do for now. See Bug 800244.
-  public static String GECKO_PREFERENCES_CLASS = "org.mozilla.gecko.GeckoPreferences";
+  public static String GECKO_PREFERENCES_CLASS = "org.mozilla.gecko.preferences.GeckoPreferences";
   public static String GECKO_BROADCAST_ANNOUNCEMENTS_PREF_METHOD  = "broadcastAnnouncementsPref";
   public static String GECKO_BROADCAST_HEALTHREPORT_UPLOAD_PREF_METHOD  = "broadcastHealthReportUploadPref";
   public static String GECKO_BROADCAST_HEALTHREPORT_PRUNE_METHOD = "broadcastHealthReportPrune";

mobile/android/base/moz.build

@@ -83,9 +83,6 @@ gbjar.sources += [
     'ANRReporter.java',
     'ActivityHandlerHelper.java',
     'AlertNotification.java',
-    'AlignRightLinkPreference.java',
-    'AndroidImport.java',
-    'AndroidImportPreference.java',
     'AppNotificationClient.java',
     'AutocompleteHandler.java',
     'animation/AnimatorProxy.java',
@@ -120,23 +117,21 @@ gbjar.sources += [
     'FilePickerResultHandler.java',
     'FilePickerResultHandlerSync.java',
     'FindInPageBar.java',
-    'FontSizePreference.java',
     'FormAssistPopup.java',
     'ForwardButton.java',
     'GeckoAccessibility.java',
     'GeckoApplication.java',
     'GeckoApp.java',
     'GeckoAppShell.java',
     'GeckoActivity.java',
+    'GeckoActivityStatus.java',
     'GeckoBatteryManager.java',
     'GeckoConnectivityReceiver.java',
     'GeckoEditable.java',
     'GeckoEvent.java',
     'GeckoHalDefines.java',
     'GeckoInputConnection.java',
     'GeckoMessageReceiver.java',
-    'GeckoPreferences.java',
-    'GeckoPreferenceFragment.java',
     'GeckoProfile.java',
     'GeckoSmsManager.java',
     'GeckoThread.java',
@@ -151,10 +146,8 @@ gbjar.sources += [
     'JavaAddonManager.java',
     'LightweightTheme.java',
     'LightweightThemeDrawable.java',
-    'LinkPreference.java',
     'MemoryMonitor.java',
     'MotionEventInterceptor.java',
-    'MultiChoicePreference.java',
     'NotificationClient.java',
     'NotificationHandler.java',
     'NotificationHelper.java',
@@ -163,7 +156,6 @@ gbjar.sources += [
     'OrderedBroadcastHelper.java',
     'PageActionLayout.java',
     'PrefsHelper.java',
-    'PrivateDataPreference.java',
     'PrivateTab.java',
     'prompts/Prompt.java',
     'prompts/PromptInput.java',
@@ -185,7 +177,6 @@ gbjar.sources += [
     'SiteIdentityPopup.java',
     'SmsManager.java',
     'SurfaceBits.java',
-    'SyncPreference.java',
     'Tab.java',
     'TabCounter.java',
     'Tabs.java',
@@ -287,8 +278,18 @@ gbjar.sources += [
     'menu/MenuItemDefault.java',
     'menu/MenuPanel.java',
     'menu/MenuPopup.java',
+    'preferences/AlignRightLinkPreference.java',
+    'preferences/AndroidImport.java',
+    'preferences/AndroidImportPreference.java',
+    'preferences/FontSizePreference.java',
+    'preferences/GeckoPreferences.java',
+    'preferences/GeckoPreferenceFragment.java',
+    'preferences/LinkPreference.java',
+    'preferences/MultiChoicePreference.java',
+    'preferences/PrivateDataPreference.java',
     'preferences/SearchPreferenceCategory.java',
     'preferences/SearchEnginePreference.java',
+    'preferences/SyncPreference.java',
     'updater/UpdateServiceHelper.java',
     'updater/UpdateService.java',
     'widget/ActivityChooserModel.java',

mobile/android/base/AlignRightLinkPreference.java → mobile/android/base/preferences/AlignRightLinkPreference.java

@@ -3,7 +3,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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.preferences;
+
+import org.mozilla.gecko.R;
 
 import android.content.Context;
 import android.util.AttributeSet;

mobile/android/base/AndroidImport.java → mobile/android/base/preferences/AndroidImport.java

@@ -3,8 +3,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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.preferences;
 
+import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserContract.Bookmarks;
 import org.mozilla.gecko.db.LocalBrowserDB;

mobile/android/base/AndroidImportPreference.java → mobile/android/base/preferences/AndroidImportPreference.java

@@ -3,8 +3,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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.preferences;
 
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.app.ProgressDialog;

mobile/android/base/FontSizePreference.java → mobile/android/base/preferences/FontSizePreference.java

@@ -3,7 +3,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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.preferences;
+
+import org.mozilla.gecko.R;
 
 import android.app.AlertDialog;
 import android.content.Context;

mobile/android/base/GeckoPreferenceFragment.java → mobile/android/base/preferences/GeckoPreferenceFragment.java

@@ -3,7 +3,10 @@
  * 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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.preferences;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.PrefsHelper;
 
 import android.preference.Preference;
 import android.preference.PreferenceActivity;

mobile/android/base/GeckoPreferences.java → mobile/android/base/preferences/GeckoPreferences.java

@@ -3,14 +3,22 @@
  * 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/. */
 
-package org.mozilla.gecko;
-
+package org.mozilla.gecko.preferences;
+
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.DataReportingNotification;
+import org.mozilla.gecko.GeckoActivityStatus;
+import org.mozilla.gecko.GeckoApp;
+import org.mozilla.gecko.GeckoApplication;
+import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.GeckoEvent;
+import org.mozilla.gecko.GeckoProfile;
+import org.mozilla.gecko.PrefsHelper;
 import org.mozilla.gecko.background.announcements.AnnouncementsConstants;
 import org.mozilla.gecko.background.common.GlobalConstants;
 import org.mozilla.gecko.background.healthreport.HealthReportConstants;
-import org.mozilla.gecko.preferences.SearchEnginePreference;
 import org.mozilla.gecko.util.GeckoEventListener;
-import org.mozilla.gecko.GeckoPreferenceFragment;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import org.json.JSONArray;

mobile/android/base/LinkPreference.java → mobile/android/base/preferences/LinkPreference.java

@@ -3,7 +3,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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.preferences;
+
+import org.mozilla.gecko.Tabs;
 
 import android.content.Context;
 import android.preference.Preference;

mobile/android/base/MultiChoicePreference.java → mobile/android/base/preferences/MultiChoicePreference.java

@@ -3,8 +3,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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.preferences;
 
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.util.ThreadUtils;
 
 import android.app.AlertDialog;

mobile/android/base/PrivateDataPreference.java → mobile/android/base/preferences/PrivateDataPreference.java

@@ -3,7 +3,10 @@
  * 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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.preferences;
+
+import org.mozilla.gecko.GeckoAppShell;
+import org.mozilla.gecko.GeckoEvent;
 
 import org.json.JSONException;
 import org.json.JSONObject;

mobile/android/base/SyncPreference.java → mobile/android/base/preferences/SyncPreference.java

@@ -3,7 +3,7 @@
  * 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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.preferences;
 
 import org.mozilla.gecko.sync.setup.SyncAccounts;
 import org.mozilla.gecko.sync.setup.activities.SetupSyncActivity;

mobile/android/base/resources/xml-v11/preference_headers.xml

@@ -9,31 +9,31 @@
 
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:title="@string/pref_header_customize">
         <extra android:name="resource"
                android:value="preferences_customize_tablet"/>
     </header>
 
-    <header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:title="@string/pref_header_display">
         <extra android:name="resource"
                android:value="preferences_display"/>
     </header>
 
-    <header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:title="@string/pref_header_privacy_short">
         <extra android:name="resource"
                android:value="preferences_privacy"/>
     </header>
 
-    <header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:title="@string/pref_header_vendor">
         <extra android:name="resource"
                android:value="preferences_vendor"/>
     </header>
 
-    <header android:fragment="org.mozilla.gecko.GeckoPreferenceFragment"
+    <header android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
             android:title="@string/pref_header_devtools">
         <extra android:name="resource"
                android:value="preferences_devtools"/>

mobile/android/base/resources/xml-v11/preferences.xml

@@ -11,38 +11,38 @@
                   xmlns:gecko="http://schemas.android.com/apk/res-auto"
                   android:enabled="false">
 
-    <org.mozilla.gecko.SyncPreference android:key="android.not_a_preference.sync"
-                                      android:title="@string/pref_sync"
-                                      android:persistent="false" />
+    <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
+                                                  android:title="@string/pref_sync"
+                                                  android:persistent="false" />
 
     <PreferenceScreen android:title="@string/pref_category_customize"
-                      android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_customize"/>
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/pref_category_display"
-                      android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_display" />
     </PreferenceScreen>
 
 
     <PreferenceScreen android:title="@string/pref_category_privacy_short"
-                      android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_privacy" />
     </PreferenceScreen>
 
 
     <PreferenceScreen android:title="@string/pref_category_vendor"
-                      android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_vendor"/>
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/pref_category_devtools"
-                      android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
+                      android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_devtools"/>
     </PreferenceScreen>

mobile/android/base/resources/xml-v11/preferences_customize.xml

@@ -10,12 +10,12 @@
                   android:enabled="false">
 
      <PreferenceScreen android:title="@string/pref_category_search"
-                       android:fragment="org.mozilla.gecko.GeckoPreferenceFragment" >
+                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
          <extra android:name="resource"
                 android:value="preferences_search"/>
      </PreferenceScreen>
 
-    <org.mozilla.gecko.AndroidImportPreference
+    <org.mozilla.gecko.preferences.AndroidImportPreference
                   android:key="android.not_a_preference.import_android"
                   gecko:entries="@array/pref_import_android_entries"
                   gecko:entryKeys="@array/pref_import_android_keys"