Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ad06bbd authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Remove system tutorial option in Settings->About." into ics-mr1

parents 81dfecf8 75a51aa6

res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -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 -->

res/xml/device_info_settings.xml

+1 −7
Original line number Diff line number Diff line
@@ -80,12 +80,6 @@ 
            <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"

src/com/android/settings/DeviceInfoSettings.java

+0 −11
Original line number Diff line number Diff line
@@ -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");