PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Amith Yamasani
2011-11-08 17:30:23 -08:00
committed by Android (Google) Code Review
parent 81dfecf8ba 75a51aa6d2
commit 2ad06bbd5f
3 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -2131,12 +2131,6 @@
<!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip /> <!-- 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 --> <!-- About phone settings screen, setting option name to see terms and conditions -->
<string name="terms_title">Terms and conditions</string> <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 /> <!-- Title for actual Settings license activity. --> <skip />
<!-- About phone settings, Legal information setting option name and title of dialog box holding license info --> <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->

8
res/xml/device_info_settings.xml
View File

@@ -80,13 +80,7 @@
<intent android:action="android.settings.TEAM" /> <intent android:action="android.settings.TEAM" />
</PreferenceScreen> </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 --> <!-- Device hardware model -->
<Preference android:key="device_model" <Preference android:key="device_model"
style="?android:preferenceInformationStyle" style="?android:preferenceInformationStyle"

11
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -67,17 +67,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
addPreferencesFromResource(R.xml.device_info_settings); 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); setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
findPreference(KEY_FIRMWARE_VERSION).setEnabled(true); findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband"); setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband");