You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dp...@apache.org on 2017/07/14 20:10:33 UTC
android commit: [CB-10916] Support display name for Android
Repository: cordova-android
Updated Branches:
refs/heads/master 76dd8613c -> 22645d915
[CB-10916] Support display name for Android
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/22645d91
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/22645d91
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/22645d91
Branch: refs/heads/master
Commit: 22645d9158075b99d43cdcd9551c52a3bcf9ed29
Parents: 76dd861
Author: Darryl Pogue <da...@ayogo.com>
Authored: Tue Jun 7 13:02:18 2016 -0700
Committer: Darryl Pogue <da...@ayogo.com>
Committed: Fri Jul 14 17:37:15 2017 -0230
----------------------------------------------------------------------
bin/templates/cordova/lib/prepare.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/22645d91/bin/templates/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js
index 69fa555..d9431f0 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);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org