diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-11 22:32:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 22:32:15 -0700 |
| commit | 0e4048721980926ed9f78de955658eb5d07dcfc4 (patch) | |
| tree | e2fc3b5fd03bfc6d80ff4459f0b5da3b3225628f | |
| parent | cd361907d510224da4eceba8dd7958f0ddc5d55d (diff) | |
| parent | 3673546205ebf1b4c83c212c1032eea38c8adbe7 (diff) | |
| download | packages_apps_settings-0e4048721980926ed9f78de955658eb5d07dcfc4.zip packages_apps_settings-0e4048721980926ed9f78de955658eb5d07dcfc4.tar.gz packages_apps_settings-0e4048721980926ed9f78de955658eb5d07dcfc4.tar.bz2 | |
am 36735462: More version info.
Merge commit '3673546205ebf1b4c83c212c1032eea38c8adbe7' into gingerbread-plus-aosp
* commit '3673546205ebf1b4c83c212c1032eea38c8adbe7':
More version info.
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index a769c38..a2c22ab 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -17,29 +17,24 @@ package com.android.settings; 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.Bundle; import android.os.SystemProperties; import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceGroup; -import android.util.Config; +import android.preference.PreferenceScreen; import android.util.Log; +import android.view.MotionEvent; import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; -import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; public class DeviceInfoSettings extends PreferenceActivity { - 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_TEAM = "team"; @@ -57,6 +52,7 @@ public class DeviceInfoSettings extends PreferenceActivity { addPreferencesFromResource(R.xml.device_info_settings); setStringSummary("firmware_version", Build.VERSION.RELEASE); + findPreference("firmware_version").setEnabled(true); setValueSummary("baseband_version", "gsm.version.baseband"); setStringSummary("device_model", Build.MODEL); setStringSummary("build_number", Build.DISPLAY); @@ -90,6 +86,20 @@ public class DeviceInfoSettings extends PreferenceActivity { Utils.updatePreferenceToSpecificActivityOrRemove(this, parentPreference, KEY_CONTRIBUTORS, 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, String preference, String property ) { |