summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanesh M <daneshm90@gmail.com>2014-01-24 16:42:48 -0800
committerDanesh M <daneshm90@gmail.com>2014-01-25 00:43:08 +0000
commitc5b62178b3a7af557b01f637a92f04529194b3a4 (patch)
tree370cfbcd218e01a896dc9ede6a8c638139105178
parentf91e706603565c925da613b32bd85f2800621313 (diff)
downloadandroid_packages_apps_Trebuchet-c5b62178b3a7af557b01f637a92f04529194b3a4.tar.gz
android_packages_apps_Trebuchet-c5b62178b3a7af557b01f637a92f04529194b3a4.tar.bz2
android_packages_apps_Trebuchet-c5b62178b3a7af557b01f637a92f04529194b3a4.zip
Trebuchet : Finalize labelling
Change-Id: If09c4d7599ecbbe4adbf41def8fbd468d95377b4
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/values/cm_strings.xml4
-rw-r--r--src/com/android/launcher3/settings/SettingsActivity.java2
3 files changed, 5 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 52d7ba841..d6fa33502 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -65,7 +65,7 @@
<application
android:name="com.android.launcher3.LauncherApplication"
- android:label="@string/application_name"
+ android:label="@string/cm_application_name"
android:icon="@mipmap/ic_launcher_home"
android:hardwareAccelerated="true"
android:largeHeap="@bool/config_largeHeap"
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index bb0aa9d46..f8583867a 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <!-- Application name -->
+ <string name="cm_application_name">Trebuchet</string>
<!-- App copyright -->
<string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string>
<!-- App version -->
@@ -52,4 +54,4 @@
<string name="preferences_interface_general_icons_large_summary">Use extra large application icons in homescreen and drawer</string>
<string name="preferences_interface_general_icons_text_style_title">Text font style</string>
<string name="preferences_interface_general_icons_text_style_summary">Variant and style of font to use for icon text</string>
-</resources> \ No newline at end of file
+</resources>
diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index d06c3095c..88c1c9306 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -94,7 +94,7 @@ public class SettingsActivity extends PreferenceActivity
// Version preference
if (header.id == R.id.preferences_application_version) {
- header.title = getString(R.string.application_name) + " " + getString(R.string.application_version);
+ header.title = getString(R.string.cm_application_name) + " " + getString(R.string.application_version);
}
// Increment if not removed