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

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

Browse Source 
Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp

* commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74':
  Separate the Settings activity name into two different strings.
This commit is contained in:
Eric Fischer
2010-10-01 12:04:08 -07:00
committed by Android Git Automerger
parent 3cda486cd2 340c5c4237
commit 25c52b70fa
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 --> <!-- 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:taskAffinity="com.android.settings"
android:clearTaskOnLaunch="true" android:clearTaskOnLaunch="true"
android:launchMode="singleTop"> android:launchMode="singleTop">

4
res/values/strings.xml
View File

@@ -467,8 +467,10 @@
<!-- Button label for generic cancel action --> <!-- Button label for generic cancel action -->
<string name="cancel">Cancel</string> <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> <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 --> <!-- Label for option to select a settings panel as a shortcut -->
<string name="settings_shortcut">Settings</string> <string name="settings_shortcut">Settings</string>
<!-- Wireless controls settings screen, setting check box label --> <!-- Wireless controls settings screen, setting check box label -->