summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-09-04 05:46:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-04 05:46:10 +0000
commit925c4071a0dab30df5ef985cfb679c17790d7f7f (patch)
tree5e07022a01c6d3333dcfecd6e076e87a44526527 /res
parent6d17cd877e6567402292cda4a049fed7330ebb8e (diff)
parentfc92dd7dfe3e0b1cfdf2777e680cb21319047853 (diff)
am fc92dd7d: am d58dd08e: am faa14adf: Merge "Clean up activity/application labels" into lmp-dev
* commit 'fc92dd7dfe3e0b1cfdf2777e680cb21319047853': Clean up activity/application labels
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f9bd79e0c..a59ea4741 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,12 +17,14 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Directory partition name -->
+
+ <!-- Application name used in Settings/Apps. Default label for activities
+ that don't specify a label. -->
<string name="applicationLabel">Dialer</string>
<!-- Title for the activity that dials the phone. This is the name
- used in the Launcher icon. -->
- <string name="launcherDialer">Phone</string>
+ used in the Launcher icon. -->
+ <string name="launcherActivityLabel">Phone</string>
<!-- The description text for the dialer tab.