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

resolved conflicts for merge of 59561e0a to master

Browse Source 
Change-Id: I9d031ce8f9627bb5e8b28f867e2890c354856df9
This commit is contained in:
Freeman Ng
2010-10-13 19:09:08 -07:00
parent 5c9bd5f127 59561e0ada
commit 56a52c5aec
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,10 @@
package com.android.settings; package com.android.settings;
import android.app.Activity; import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemClock; import android.os.SystemClock;
@@ -25,11 +28,13 @@ import android.os.SystemProperties;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceGroup; import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.provider.Settings;
import android.util.Log; import android.util.Log;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -53,6 +58,17 @@ 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("firmware_version", Build.VERSION.RELEASE); setStringSummary("firmware_version", Build.VERSION.RELEASE);
findPreference("firmware_version").setEnabled(true); findPreference("firmware_version").setEnabled(true);
setValueSummary("baseband_version", "gsm.version.baseband"); setValueSummary("baseband_version", "gsm.version.baseband");