summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-11-08 11:08:28 -0800
committerAmith Yamasani <yamasani@google.com>2011-11-08 11:08:28 -0800
commit75a51aa6d239f64ca2ec81f4e52a540648e86c27 (patch)
treef1dcffff188933770a2b065cdc91b993bce8bffa /res
parent8214d201db04c27ed82265ec46f85a87f1adf179 (diff)
downloadpackages_apps_Settings-75a51aa6d239f64ca2ec81f4e52a540648e86c27.tar.gz
packages_apps_Settings-75a51aa6d239f64ca2ec81f4e52a540648e86c27.tar.bz2
packages_apps_Settings-75a51aa6d239f64ca2ec81f4e52a540648e86c27.zip
Remove system tutorial option in Settings->About.
It was being activated by third party IMEs that have tutorials. Remove the code permanently, since we don't support the system tutorial flow anymore. Bug: 5425836 Change-Id: I691b8d48309b3dd3a25c9994334dc4692a70e482
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/xml/device_info_settings.xml8
2 files changed, 1 insertions, 13 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f9e9c8962..fcbaf089a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2128,12 +2128,6 @@
<!-- 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" product="tablet">Learn how to use your tablet</string>
- <!-- About phone settings screen, summary of what System Tutorial does -->
- <string name="system_tutorial_list_item_summary" product="default">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 4dfc718dc..d2ead7f22 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -80,13 +80,7 @@
<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"