Clean up activity/application labels

Bug:17357577
Change-Id: Ibaa4251665e46cf29d36190670042522da9baeaf
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 92d6d94..af2dabc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -67,7 +67,7 @@
              stateAlwaysHidden is set to suppress keyboard show up on
              dialpad screen. -->
         <activity android:name=".DialtactsActivity"
-            android:label="@string/launcherDialer"
+            android:label="@string/launcherActivityLabel"
             android:theme="@style/DialtactsActivityTheme"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f9bd79e..a59ea47 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.