Merge "Remove system tutorial option in Settings->About." into ics-mr1
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 20fa0df..362e5b7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2131,12 +2131,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 4dfc718..d2ead7f 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"
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index eada8a7..89f87a8 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -67,17 +67,6 @@
addPreferencesFromResource(R.xml.device_info_settings);
- // If we don't have an IME tutorial, remove that option
- String currentIme = Settings.Secure.getString(getContentResolver(),
- Settings.Secure.DEFAULT_INPUT_METHOD);
- ComponentName component = ComponentName.unflattenFromString(currentIme);
- Intent imeIntent = new Intent(component.getPackageName() + ".tutorial");
- PackageManager pm = getPackageManager();
- List<ResolveInfo> tutorials = pm.queryIntentActivities(imeIntent, 0);
- if(tutorials == null || tutorials.isEmpty()) {
- getPreferenceScreen().removePreference(findPreference("system_tutorial"));
- }
-
setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");