From 75a51aa6d239f64ca2ec81f4e52a540648e86c27 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 8 Nov 2011 11:08:28 -0800
Subject: [PATCH] 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
---
 res/values/strings.xml                           |  6 ------
 res/xml/device_info_settings.xml                 |  8 +-------
 src/com/android/settings/DeviceInfoSettings.java | 11 -----------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f9e9c896294..fcbaf089ab2 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 4dfc718dc64..d2ead7f2245 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 eada8a7965b..89f87a8d34f 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -67,17 +67,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
 
         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");