From 76dd8613ca0f0914da9129e171653117572933f6 Mon Sep 17 00:00:00 2001 From: filmaj Date: Fri, 14 Jul 2017 11:13:52 -0500 Subject: [PATCH 1/3] CB-12423: make explicit JDK 1.8 or greater is needed in the README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f01282fd..2b97582f 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ at the core, applications written with web technology: HTML, CSS and JavaScript. ## Requires -- Java JDK 1.6 or greater +- Java JDK 1.8 or greater - Android SDK [http://developer.android.com](http://developer.android.com) From 22645d9158075b99d43cdcd9551c52a3bcf9ed29 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Tue, 7 Jun 2016 13:02:18 -0700 Subject: [PATCH 2/3] [CB-10916] Support display name for Android --- bin/templates/cordova/lib/prepare.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js index 69fa5556..d9431f05 100644 --- a/bin/templates/cordova/lib/prepare.js +++ b/bin/templates/cordova/lib/prepare.js @@ -167,9 +167,16 @@ function cleanWww (projectRoot, locations) { */ function updateProjectAccordingTo (platformConfig, locations) { // Update app name by editing res/values/strings.xml - var name = platformConfig.name(); var strings = xmlHelpers.parseElementtreeSync(locations.strings); + + var name = platformConfig.name(); strings.find('string[@name="app_name"]').text = name.replace(/\'/g, '\\\''); + + var shortName = platformConfig.shortName && platformConfig.shortName(); + if (shortName && shortName != name) { + strings.find('string[@name="launcher_name"]').text = shortName.replace(/\'/g, '\\\''); + } + fs.writeFileSync(locations.strings, strings.write({indent: 4}), 'utf-8'); events.emit('verbose', 'Wrote out android application name "' + name + '" to ' + locations.strings); From 893356abcd1b005a13bb09e7467f227b52de3ae5 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Tue, 18 Jul 2017 14:13:53 -0700 Subject: [PATCH 3/3] CB-13034: Fixing eslint error --- bin/templates/cordova/lib/prepare.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js index d9431f05..b0bfb299 100644 --- a/bin/templates/cordova/lib/prepare.js +++ b/bin/templates/cordova/lib/prepare.js @@ -173,7 +173,7 @@ function updateProjectAccordingTo (platformConfig, locations) { strings.find('string[@name="app_name"]').text = name.replace(/\'/g, '\\\''); var shortName = platformConfig.shortName && platformConfig.shortName(); - if (shortName && shortName != name) { + if (shortName && shortName !== name) { strings.find('string[@name="launcher_name"]').text = shortName.replace(/\'/g, '\\\''); }