Bug 860523 - Add namespace wrapper for WebApps. r=wesj

--HG--
rename : mobile/android/base/WebApps.java.in => mobile/android/base/WebApp.java.in
rename : mobile/android/base/WebApp.java => mobile/android/base/WebAppImpl.java

mobile/android/base/AndroidManifest.xml.in

@@ -146,7 +146,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="org.mozilla.gecko.WebApp"
+        <activity android:name=".WebApp"
                   android:label="@string/webapp_generic_name"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"

mobile/android/base/GeckoAppShell.java

@@ -584,7 +584,7 @@ public class GeckoAppShell
         intent.setAction(GeckoApp.ACTION_WEBAPP_PREFIX + aIndex);
         intent.setData(Uri.parse(aURI));
         intent.setClassName(AppConstants.ANDROID_PACKAGE_NAME,
-                            "org.mozilla.gecko.WebApps$WebApp" + aIndex);
+                            AppConstants.ANDROID_PACKAGE_NAME + ".WebApps$WebApp" + aIndex);
         return intent;
     }
 

mobile/android/base/Makefile.in

@@ -161,8 +161,8 @@ FENNEC_JAVA_FILES = \
   TouchEventInterceptor.java \
   UpdateServiceHelper.java \
   VideoPlayer.java \
-  WebApp.java \
   WebAppAllocator.java \
+  WebAppImpl.java \
   ZoomConstraints.java \
   db/BrowserContract.java \
   db/BrowserProvider.java \
@@ -261,6 +261,7 @@ FENNEC_PP_JAVA_VIEW_FILES = \
 FENNEC_PP_JAVA_FILES = \
   App.java \
   AppConstants.java \
+  WebApp.java \
   WebApps.java \
   $(NULL)
 

mobile/android/base/WebApp.java.in

@@ -0,0 +1,15 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * 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/. */
+
+#filter substitution
+package @ANDROID_PACKAGE_NAME@;
+
+import org.mozilla.gecko.WebAppImpl;
+
+/**
+ * This class serves only as a namespace wrapper for WebAppImpl.
+ */
+public class WebApp extends WebAppImpl {}
+

mobile/android/base/WebAppImpl.java

@@ -26,8 +26,8 @@ import android.view.Display;
 import java.net.URL;
 import java.io.File;
 
-public class WebApp extends GeckoApp {
-    private static final String LOGTAG = "WebApp";
+public class WebAppImpl extends GeckoApp {
+    private static final String LOGTAG = "GeckoWebAppImpl";
 
     private URL mOrigin;
     private TextView mTitlebarText = null;

mobile/android/base/WebAppManifestFragment.xml.frag

@@ -1,4 +1,4 @@
-        <activity android:name="org.mozilla.gecko.WebApps$WebApp@APPNUM@"
+        <activity android:name=".WebApps$WebApp@APPNUM@"
                   android:label="@string/webapp_generic_name"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:windowSoftInputMode="stateUnspecified|adjustResize"

mobile/android/base/WebApps.java.in

@@ -4,8 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #filter substitution
-
-package org.mozilla.gecko;
+package @ANDROID_PACKAGE_NAME@;
 
 public final class WebApps {