github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-07 23:03:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-5080 Find resources in a way that works with aapt's --rename-manifest-package

Browse Source 
(cherry picked from commit 16de12a3ba)
This commit is contained in:
Andrew Grieve 2013-10-15 12:17:14 -04:00
parent edb35b5a6d
commit 93b9b53acb
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/org/apache/cordova/Config.java
View File

@ -72,7 +72,7 @@ public class Config {
return; return;
} }
int id = action.getResources().getIdentifier("config", "xml", action.getPackageName()); int id = action.getResources().getIdentifier("config", "xml", action.getClass().getPackage().getName());
if (id == 0) { if (id == 0) {
id = action.getResources().getIdentifier("cordova", "xml", action.getPackageName()); id = action.getResources().getIdentifier("cordova", "xml", action.getPackageName());
LOG.i("CordovaLog", "config.xml missing, reverting to cordova.xml"); LOG.i("CordovaLog", "config.xml missing, reverting to cordova.xml");
@ -123,7 +123,7 @@ public class Config {
{ {
value = "splash"; 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); action.getIntent().putExtra(name, resource);
} }

7
framework/src/org/apache/cordova/PluginManager.java
View File

@ -107,12 +107,7 @@ public class PluginManager {
* Load plugins from res/xml/config.xml * Load plugins from res/xml/config.xml
*/ */
public void loadPlugins() { public void loadPlugins() {
int id = this.ctx.getActivity().getResources().getIdentifier("config", "xml", this.ctx.getActivity().getPackageName()); int id = this.ctx.getActivity().getResources().getIdentifier("config", "xml", this.ctx.getActivity().getClass().getPackage().getName());
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");
}
if (id == 0) { if (id == 0) {
this.pluginConfigurationMissing(); this.pluginConfigurationMissing();
//We have the error, we need to exit without crashing! //We have the error, we need to exit without crashing!