You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/10/22 21:20:14 UTC
[16/16] android commit: CB-5080 Find resources in a way that works
with aapt's --rename-manifest-package (cherry picked from commit
16de12a3ba3c0ed8cfa15e9c9d7d68d384d178bb)
CB-5080 Find resources in a way that works with aapt's --rename-manifest-package
(cherry picked from commit 16de12a3ba3c0ed8cfa15e9c9d7d68d384d178bb)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/93b9b53a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/93b9b53a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/93b9b53a
Branch: refs/heads/2.9.x
Commit: 93b9b53acbf333f3cb8ba61bad732a2b9cf4d765
Parents: edb35b5
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Oct 15 12:17:14 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Oct 22 15:18:44 2013 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/Config.java | 4 ++--
framework/src/org/apache/cordova/PluginManager.java | 7 +------
2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/93b9b53a/framework/src/org/apache/cordova/Config.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Config.java b/framework/src/org/apache/cordova/Config.java
index 3ef35a5..76eda1b 100644
--- a/framework/src/org/apache/cordova/Config.java
+++ b/framework/src/org/apache/cordova/Config.java
@@ -72,7 +72,7 @@ public class Config {
return;
}
- int id = action.getResources().getIdentifier("config", "xml", action.getPackageName());
+ int id = action.getResources().getIdentifier("config", "xml", action.getClass().getPackage().getName());
if (id == 0) {
id = action.getResources().getIdentifier("cordova", "xml", action.getPackageName());
LOG.i("CordovaLog", "config.xml missing, reverting to cordova.xml");
@@ -123,7 +123,7 @@ public class Config {
{
value = "splash";
}
- resource = action.getResources().getIdentifier(value, "drawable", action.getPackageName());
+ resource = action.getResources().getIdentifier(value, "drawable", action.getClass().getPackage().getName());
action.getIntent().putExtra(name, resource);
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/93b9b53a/framework/src/org/apache/cordova/PluginManager.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/PluginManager.java b/framework/src/org/apache/cordova/PluginManager.java
index 2db9d56..5249f50 100755
--- a/framework/src/org/apache/cordova/PluginManager.java
+++ b/framework/src/org/apache/cordova/PluginManager.java
@@ -107,12 +107,7 @@ public class PluginManager {
* Load plugins from res/xml/config.xml
*/
public void loadPlugins() {
- int id = this.ctx.getActivity().getResources().getIdentifier("config", "xml", this.ctx.getActivity().getPackageName());
- if(id == 0)
- {
- id = this.ctx.getActivity().getResources().getIdentifier("plugins", "xml", this.ctx.getActivity().getPackageName());
- LOG.i(TAG, "Using plugins.xml instead of config.xml. plugins.xml will eventually be deprecated");
- }
+ int id = this.ctx.getActivity().getResources().getIdentifier("config", "xml", this.ctx.getActivity().getClass().getPackage().getName());
if (id == 0) {
this.pluginConfigurationMissing();
//We have the error, we need to exit without crashing!