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

am 0e404872: am 36735462: More version info.

Browse Source 
Merge commit '0e4048721980926ed9f78de955658eb5d07dcfc4'

* commit '0e4048721980926ed9f78de955658eb5d07dcfc4':
  More version info.
This commit is contained in:
Dianne Hackborn
2010-08-11 22:34:43 -07:00
committed by Android Git Automerger
parent abf87dca0a 0e40487219
commit b2d2a6c63f
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,29 +17,24 @@
package com.android.settings; package com.android.settings;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ApplicationInfo;
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.SystemProperties; import android.os.SystemProperties;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceGroup; import android.preference.PreferenceGroup;
import android.util.Config; import android.preference.PreferenceScreen;
import android.util.Log; import android.util.Log;
import android.view.MotionEvent;
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;
public class DeviceInfoSettings extends PreferenceActivity { public class DeviceInfoSettings extends PreferenceActivity {
private static final String TAG = "DeviceInfoSettings"; private static final String TAG = "DeviceInfoSettings";
private static final boolean LOGD = false || Config.LOGD;
private static final String KEY_CONTAINER = "container"; private static final String KEY_CONTAINER = "container";
private static final String KEY_TEAM = "team"; private static final String KEY_TEAM = "team";
@@ -57,6 +52,7 @@ public class DeviceInfoSettings extends PreferenceActivity {
addPreferencesFromResource(R.xml.device_info_settings); addPreferencesFromResource(R.xml.device_info_settings);
setStringSummary("firmware_version", Build.VERSION.RELEASE); setStringSummary("firmware_version", Build.VERSION.RELEASE);
findPreference("firmware_version").setEnabled(true);
setValueSummary("baseband_version", "gsm.version.baseband"); setValueSummary("baseband_version", "gsm.version.baseband");
setStringSummary("device_model", Build.MODEL); setStringSummary("device_model", Build.MODEL);
setStringSummary("build_number", Build.DISPLAY); setStringSummary("build_number", Build.DISPLAY);
@@ -90,6 +86,20 @@ public class DeviceInfoSettings extends PreferenceActivity {
Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_CONTRIBUTORS, Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_CONTRIBUTORS,
Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY); Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
} }
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
if (preference.getKey().equals("firmware_version")) {
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.setClassName("android",
com.android.internal.app.PlatLogoActivity.class.getName());
try {
startActivity(intent);
} catch (Exception e) {
}
}
return super.onPreferenceTreeClick(preferenceScreen, preference);
}
private void removePreferenceIfPropertyMissing(PreferenceGroup preferenceGroup, private void removePreferenceIfPropertyMissing(PreferenceGroup preferenceGroup,
String preference, String property ) { String preference, String property ) {