PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 25c52b70: am 340c5c42: Separate the Settings activity name into two different strings.

Browse Source 
Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79'

* commit '25c52b70faceb24cade0f5480c372de3f47bdf79':
  Separate the Settings activity name into two different strings.
This commit is contained in:
Eric Fischer
2010-10-01 12:06:18 -07:00
committed by Android Git Automerger
parent ce0a7b2df0 25c52b70fa
commit 4e6466f5ef
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@@ -48,7 +48,8 @@
<!-- Settings -->
<activity android:name="Settings" android:label="@string/settings_label"
<activity android:name="Settings"
android:label="@string/settings_label_launcher"
android:taskAffinity="com.android.settings"
android:theme="@android:style/Theme.Holo"
android:launchMode="singleTop">

4
res/values/strings.xml
View File

@@ -474,8 +474,10 @@
<!-- Button label for generic cancel action -->
<string name="cancel">Cancel</string>
<!-- Main Settings screen title -->
<!-- Title of the Settings activity shown within the application itself. -->
<string name="settings_label">Settings</string>
<!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
<string name="settings_label_launcher">Settings</string>
<!-- Label for option to select a settings panel as a shortcut -->
<string name="settings_shortcut">Settings</string>
<!-- Wireless controls settings screen, setting check box label -->