CB-6860 Add activity_name and launcher_name to AndroidManifest.xml & strings.xml
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/74354121 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/74354121 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/74354121 Branch: refs/heads/4.0.x Commit: 743541218ff960ca542c53a4883b1866cec5ebd4 Parents: 94de0a7 Author: Andrew Grieve <[email protected]> Authored: Tue Jun 3 16:08:35 2014 -0400 Committer: Andrew Grieve <[email protected]> Committed: Tue Jun 3 16:08:35 2014 -0400 ---------------------------------------------------------------------- bin/templates/project/AndroidManifest.xml | 8 +++++--- bin/templates/project/res/values/strings.xml | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/74354121/bin/templates/project/AndroidManifest.xml ---------------------------------------------------------------------- diff --git a/bin/templates/project/AndroidManifest.xml b/bin/templates/project/AndroidManifest.xml index b031b60..315a4dd 100644 --- a/bin/templates/project/AndroidManifest.xml +++ b/bin/templates/project/AndroidManifest.xml @@ -32,10 +32,12 @@ <application android:icon="@drawable/icon" android:label="@string/app_name" android:hardwareAccelerated="true"> - <activity android:name="__ACTIVITY__" android:label="@string/app_name" android:launchMode="singleTop" + <activity android:name="__ACTIVITY__" + android:label="@string/activity_name" + android:launchMode="singleTop" android:theme="@android:style/Theme.Black.NoTitleBar" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"> - <intent-filter> + <intent-filter android:label="@string/launcher_name"> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> @@ -43,4 +45,4 @@ </application> <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="__APILEVEL__"/> -</manifest> +</manifest> http://git-wip-us.apache.org/repos/asf/cordova-android/blob/74354121/bin/templates/project/res/values/strings.xml ---------------------------------------------------------------------- diff --git a/bin/templates/project/res/values/strings.xml b/bin/templates/project/res/values/strings.xml index e8ed749..bb049db 100644 --- a/bin/templates/project/res/values/strings.xml +++ b/bin/templates/project/res/values/strings.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <!-- App label shown within list of installed apps, battery & network usage screens. --> <string name="app_name">__NAME__</string> + <!-- App label shown on the launcher. --> + <string name="launcher_name">@string/app_name</string> + <!-- App label shown on the task switcher. --> + <string name="activity_name">@string/launcher_name</string> </resources>
