diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-09-04 05:24:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 05:24:01 +0000 |
| commit | faa14adf81b18e49102020f035893c9aa71aa867 (patch) | |
| tree | 5e07022a01c6d3333dcfecd6e076e87a44526527 | |
| parent | b2ace69ba704ac9018d531eb7d0ff89c379380b0 (diff) | |
| parent | bf8b4b97ce5801bf85f94869e9eb449b52d85562 (diff) | |
Merge "Clean up activity/application labels" into lmp-dev
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 370a952bc..f35fc0a7a 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 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. |