diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-09-04 05:36:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 05:36:53 +0000 |
| commit | 5fa591612404125aa57253623a963602b61c7d07 (patch) | |
| tree | 064f42bfe64b53891a53e49f7ce873f686958750 | |
| parent | 20d3e6505757c369f207d0e0497711af2c468123 (diff) | |
| parent | faa14adf81b18e49102020f035893c9aa71aa867 (diff) | |
am faa14adf: Merge "Clean up activity/application labels" into lmp-dev
* commit 'faa14adf81b18e49102020f035893c9aa71aa867':
Clean up activity/application labels
| -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. |