Bug 722042 - Part 1: Remove Maemo code from mobile/android. r=blassey

mobile/android/app/Makefile.in

@@ -32,14 +32,6 @@ LIBS += \
   $(XPCOM_STANDALONE_GLUE_LDOPTS) \
   $(NULL)
 
-ifeq ($(MOZ_PLATFORM_MAEMO),6)
-LIBS += \
-  $(LIBXUL_DIST)/../widget/qt/faststartupqt/$(LIB_PREFIX)faststartupqt.$(LIB_SUFFIX) \
-  $(MOZ_QT_LIBS) \
-  $(NULL)
-LOCAL_INCLUDES += -I$(topsrcdir)/widget/qt/faststartupqt $(TK_CFLAGS)
-endif
-
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,version)
 endif
@@ -132,11 +124,6 @@ ifdef LIBXUL_SDK
 endif
 endif #} SKIP_COPY_XULRUNNER
 
-ifeq ($(MOZ_PLATFORM_MAEMO),6)
-	$(NSINSTALL) -D $(DIST)/bin/res/drawable
-	cp $(topsrcdir)/mobile/app/maemo/* $(DIST)/bin/res/drawable/
-	cp $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/content/favicon32.png $(DIST)/bin/res/drawable/
-endif
 	$(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
 
 ifeq ($(OS_ARCH),WINNT)

mobile/android/app/mobile.js

@@ -40,15 +40,6 @@ pref("toolkit.storage.synchronous", 0);
 pref("browser.viewport.scaleRatio", -1);
 pref("browser.viewport.desktopWidth", 980);
 
-#ifndef ANDROID
-#ifndef MOZ_PLATFORM_MAEMO
-// On desktop builds, simulate an MDPI tablet by default.
-pref("layout.css.dpi", 160);
-#else
-// Maemo X11 lies about its dpi
-pref("layout.css.dpi", 240);
-#endif
-#endif
 /* allow scrollbars to float above chrome ui */
 pref("ui.scrollbarsCanOverlapContent", 1);
 
@@ -90,9 +81,6 @@ pref("network.http.max-connections", 20);
 pref("network.http.max-connections-per-server", 15);
 pref("network.http.max-persistent-connections-per-server", 6);
 pref("network.http.max-persistent-connections-per-proxy", 8);
-#ifdef MOZ_PLATFORM_MAEMO
-pref("network.autodial-helper.enabled", true);
-#endif
 
 // See bug 545869 for details on why these are set the way they are
 pref("network.buffer.cache.count", 24);
@@ -380,10 +368,6 @@ pref("privacy.item.geolocation", true);
 pref("privacy.item.siteSettings", true);
 pref("privacy.item.syncAccount", true);
 
-#ifdef MOZ_PLATFORM_MAEMO
-pref("plugins.force.wmode", "opaque");
-#endif
-
 // URL to the Learn More link XXX this is the firefox one.  Bug 495578 fixes this.
 pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/geolocation/");
 
@@ -426,10 +410,7 @@ pref("browser.ui.touch.bottom", 16);
 pref("browser.ui.touch.weight.visited", 120); // percentage
 
 // plugins
-#if MOZ_PLATFORM_MAEMO == 6
-pref("plugin.disable", false);
-pref("dom.ipc.plugins.enabled", true);
-#elifdef ANDROID
+#ifdef ANDROID
 pref("plugin.disable", false);
 pref("dom.ipc.plugins.enabled", false);
 #else
@@ -443,14 +424,6 @@ pref("plugins.click_to_play", true);
 // Bug 756253
 pref("plugins.use_placeholder", 0);
 
-// process priority
-// higher values give content process less CPU time
-#if MOZ_PLATFORM_MAEMO == 5
-pref("dom.ipc.content.nice", 10);
-#else
-pref("dom.ipc.content.nice", 1);
-#endif
-
 // product URLs
 // The breakpad report server to link to in about:crashes
 pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/");
@@ -547,16 +520,6 @@ pref("app.update.url.details", "http://www.mozilla.com/%LOCALE%/mobile/");
 // replace newlines with spaces on paste into single-line text boxes
 pref("editor.singleLine.pasteNewlines", 2);
 
-#ifdef MOZ_PLATFORM_MAEMO
-// update fonts for better readability
-pref("font.default.x-baltic", "SwissA");
-pref("font.default.x-central-euro", "SwissA");
-pref("font.default.x-cyrillic", "SwissA");
-pref("font.default.x-unicode", "SwissA");
-pref("font.default.x-user-def", "SwissA");
-pref("font.default.x-western", "SwissA");
-#endif
-
 #ifdef MOZ_SERVICES_SYNC
 // sync service
 pref("services.sync.client.type", "mobile");
@@ -582,9 +545,7 @@ pref("services.sync.prefs.sync.signon.rememberSignons", true);
 pref("ui.dragThresholdX", 25);
 pref("ui.dragThresholdY", 25);
 
-#if MOZ_PLATFORM_MAEMO == 6
-pref("layers.acceleration.disabled", false);
-#elifdef ANDROID
+#ifdef ANDROID
 pref("layers.acceleration.disabled", false);
 #else
 pref("layers.acceleration.disabled", true);

mobile/android/components/DirectoryProvider.js

@@ -26,22 +26,7 @@ DirectoryProvider.prototype = {
     if (prop == NS_APP_CACHE_PARENT_DIR) {
       let dirsvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
       let profile = dirsvc.get("ProfD", Ci.nsIFile);
-
-      let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
-      let device = sysInfo.get("device");
-      switch (device) {
-#ifdef MOZ_PLATFORM_MAEMO
-        case "Nokia N900":
-          return profile;
-        
-        case "Nokia N8xx":
-          let folder = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
-          folder.initWithPath("/media/mmc2/.mozilla/fennec");
-          return folder;
-#endif
-        default:
-          return profile;
-      }
+      return profile;
     } else if (prop == XRE_UPDATE_ROOT_DIR) {
       let env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
       if (env.exists(ENVVAR_UPDATE_DIR)) {

mobile/android/components/build/Makefile.in

@@ -28,13 +28,8 @@ CPPSRCS = \
 	nsShellService.cpp \
 	$(NULL)
 
-ifeq ($(MOZ_PLATFORM_MAEMO),5)
-LOCAL_INCLUDES   += $(MOZ_DBUS_GLIB_CFLAGS)
-endif
-
 ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),qt))
 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 endif
 
 include $(topsrcdir)/config/rules.mk
-

mobile/android/components/build/nsShellService.cpp

@@ -3,10 +3,6 @@
  * 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/. */
 
-#if (MOZ_PLATFORM_MAEMO == 5)
-#include <dbus/dbus.h>
-#endif
-
 #ifdef MOZ_WIDGET_QT
 #include <QtGui/QApplication>
 #include <QtGui/QWidget>
@@ -24,23 +20,7 @@ NS_IMPL_ISUPPORTS1(nsShellService, nsIShellService)
 NS_IMETHODIMP
 nsShellService::SwitchTask()
 {
-#if (MOZ_PLATFORM_MAEMO == 5)
-  DBusError error;
-  dbus_error_init(&error);
-
-  DBusConnection *conn = dbus_bus_get(DBUS_BUS_SESSION, &error);
-
-  DBusMessage *msg = dbus_message_new_signal("/com/nokia/hildon_desktop",
-                                             "com.nokia.hildon_desktop",
-                                             "exit_app_view");
-
-  if (msg) {
-      dbus_connection_send(conn, msg, NULL);
-      dbus_message_unref(msg);
-      dbus_connection_flush(conn);
-  }
-  return NS_OK;
-#elif MOZ_WIDGET_QT
+#if MOZ_WIDGET_QT
   QWidget * window = QApplication::activeWindow();
   if (window)
       window->showMinimized();

mobile/android/installer/package-manifest.in

@@ -94,10 +94,6 @@
 @BINPATH@/recommended-addons.json
 #endif
 
-#ifdef MOZ_PLATFORM_MAEMO
-@BINPATH@/res/drawable
-#endif
-
 [browser]
 ; [Base Browser Files]
 #ifndef XP_UNIX

mobile/android/themes/core/defines.inc

@@ -119,9 +119,7 @@
 %define tablet_panel_controls  40mozmm
 %define tablet_panel_minwidth  124mozmm
 
-%ifdef MOZ_PLATFORM_MAEMO
-%define orientation -moz-device-orientation
-%elifdef ANDROID
+%ifdef ANDROID
 %define orientation -moz-device-orientation
 %else
 %define orientation orientation