Automated import from //branches/cupcake/...@142825,142825

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 67c095d..b126ec1 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1097,6 +1097,10 @@
     <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
     <!-- About phone settings screen, setting option name to see terms and conditions -->
     <string name="terms_title">Terms and conditions</string>
+    <!-- About phone settings screen, running the System Tutorial -->
+    <string name="system_tutorial_list_item_title">System Tutorial</string>
+    <!-- About phone settings screen, summary of what System Tutorial does -->
+    <string name="system_tutorial_list_item_summary">Learn how to use your phone</string>
 
     <!-- Title for actual Settings license activity. --> <skip />
     <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 205e588..bb7c531 100644 (file)
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -76,6 +76,13 @@
             <intent android:action="android.settings.TEAM" />
         </PreferenceScreen>
         
+        <!-- System Tutorial - launches activity -->
+        <PreferenceScreen android:key="system_tutorial"
+                android:title="@string/system_tutorial_list_item_title" 
+                android:summary="@string/system_tutorial_list_item_summary">
+            <intent android:action="android.intent.action.SYSTEM_TUTORIAL" />
+        </PreferenceScreen>
+        
         <!-- Device hardware model -->
         <Preference android:key="device_model" 
                 style="?android:preferenceInformationStyle"