Merge branch 'master' into StudioProjectCompat

apache · Nov 28, 2017 · 4863320 · 4863320
2 parents 2b20802 + 3ad1ed7
commit 4863320
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 1 deletion.
diff --git a/bin/templates/project/res/drawable-land-hdpi/screen.png b/bin/templates/project/res/drawable-land-hdpi/screen.png
diff --git a/bin/templates/project/res/drawable-land-ldpi/screen.png b/bin/templates/project/res/drawable-land-ldpi/screen.png
diff --git a/bin/templates/project/res/drawable-land-mdpi/screen.png b/bin/templates/project/res/drawable-land-mdpi/screen.png
diff --git a/bin/templates/project/res/drawable-land-xhdpi/screen.png b/bin/templates/project/res/drawable-land-xhdpi/screen.png
diff --git a/bin/templates/project/res/drawable-land-xxhdpi/screen.png b/bin/templates/project/res/drawable-land-xxhdpi/screen.png
diff --git a/bin/templates/project/res/drawable-land-xxxhdpi/screen.png b/bin/templates/project/res/drawable-land-xxxhdpi/screen.png
diff --git a/bin/templates/project/res/drawable-port-hdpi/screen.png b/bin/templates/project/res/drawable-port-hdpi/screen.png
diff --git a/bin/templates/project/res/drawable-port-ldpi/screen.png b/bin/templates/project/res/drawable-port-ldpi/screen.png
diff --git a/bin/templates/project/res/drawable-port-mdpi/screen.png b/bin/templates/project/res/drawable-port-mdpi/screen.png
diff --git a/bin/templates/project/res/drawable-port-xhdpi/screen.png b/bin/templates/project/res/drawable-port-xhdpi/screen.png
diff --git a/bin/templates/project/res/drawable-port-xxhdpi/screen.png b/bin/templates/project/res/drawable-port-xxhdpi/screen.png
diff --git a/bin/templates/project/res/drawable-port-xxxhdpi/screen.png b/bin/templates/project/res/drawable-port-xxxhdpi/screen.png
diff --git a/bin/templates/project/res/mipmap-hdpi/icon.png b/bin/templates/project/res/mipmap-hdpi/icon.png
diff --git a/bin/templates/project/res/mipmap-ldpi/icon.png b/bin/templates/project/res/mipmap-ldpi/icon.png
diff --git a/bin/templates/project/res/mipmap-mdpi/icon.png b/bin/templates/project/res/mipmap-mdpi/icon.png
diff --git a/bin/templates/project/res/mipmap-xhdpi/icon.png b/bin/templates/project/res/mipmap-xhdpi/icon.png
diff --git a/bin/templates/project/res/mipmap-xxhdpi/icon.png b/bin/templates/project/res/mipmap-xxhdpi/icon.png
diff --git a/bin/templates/project/res/mipmap-xxxhdpi/icon.png b/bin/templates/project/res/mipmap-xxxhdpi/icon.png
diff --git a/framework/src/org/apache/cordova/CordovaInterface.java b/framework/src/org/apache/cordova/CordovaInterface.java
@@ -19,6 +19,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 package org.apache.cordova;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 
 import org.apache.cordova.CordovaPlugin;
@@ -51,10 +52,18 @@ public interface CordovaInterface {
     /**
      * Get the Android activity.
      *
+     * If a custom engine lives outside of the Activity's lifecycle the return value may be null.
+     *
      * @return the Activity
      */
     public abstract Activity getActivity();
-
+
+    /**
+     * Get the Android context.
+     *
+     * @return the Context
+     */
+    public Context getContext();
 
     /**
      * Called when a message is sent to plugin.

diff --git a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
@@ -21,6 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ -85,6 +86,11 @@ public Activity getActivity() {
         return activity;
     }
 
+    @Override
+    public Context getContext() {
+        return activity;
+    }
+
     @Override
     public Object onMessage(String id, Object data) {
         if ("exit".equals(id)) {