summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-19 18:37:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-19 18:37:35 -0700
commit805ad7d1aa3d5177b383af3ad49df20092d2ef9d (patch)
tree4cec3baa39d7490dfaf73aaadcdeb616e03165e8 /src
parent2876ad62082207e0e02cbc38b65ce9993cb121bf (diff)
parent4749fcf762de0e34ac28f927501d42555062c521 (diff)
downloadpackages_apps_Settings-805ad7d1aa3d5177b383af3ad49df20092d2ef9d.tar.gz
packages_apps_Settings-805ad7d1aa3d5177b383af3ad49df20092d2ef9d.tar.bz2
packages_apps_Settings-805ad7d1aa3d5177b383af3ad49df20092d2ef9d.zip
am 4749fcf7: More tricksy.
Merge commit '4749fcf762de0e34ac28f927501d42555062c521' into gingerbread-plus-aosp * commit '4749fcf762de0e34ac28f927501d42555062c521': More tricksy.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/DeviceInfoSettings.java19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index a2c22ab9e..048d10aa6 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -19,6 +19,7 @@ package com.android.settings;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
+import android.os.SystemClock;
import android.os.SystemProperties;
import android.preference.Preference;
import android.preference.PreferenceActivity;
@@ -45,6 +46,8 @@ public class DeviceInfoSettings extends PreferenceActivity {
private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings";
private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal";
+ long[] mHits = new long[3];
+
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -90,12 +93,16 @@ public class DeviceInfoSettings extends PreferenceActivity {
@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) {
+ System.arraycopy(mHits, 1, mHits, 0, mHits.length-1);
+ mHits[mHits.length-1] = SystemClock.uptimeMillis();
+ if (mHits[0] >= (SystemClock.uptimeMillis()-500)) {
+ 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);