Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Goo goo ga joob." into klp-dev

Browse Source
This commit is contained in:
Daniel Sandler
2013-10-03 17:20:21 +00:00
committed by Android (Google) Code Review
parent fe5bf7a7c7 2fdb68b3c2
commit 0a66052837
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Settings.java
View File

@@ -2406,6 +2406,15 @@ public final class Settings {
*/
public static final String POINTER_SPEED = "pointer_speed";
/**
* I am the lolrus.
* <p>
* Nonzero values indicate that the user has a bukkit.
* Backward-compatible with <code>PrefGetPreference(prefAllowEasterEggs)</code>.
* @hide
*/
public static final String EGG_MODE = "egg_mode";
/**
* Settings to backup. This is here so that it's in the same place as the settings
* keys and easy to update.

10
core/java/com/android/internal/app/PlatLogoActivity.java
View File

@@ -21,6 +21,7 @@ import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
import android.provider.Settings;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -151,6 +152,13 @@ public class PlatLogoActivity extends Activity {
logo.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
if (Settings.System.getLong(getContentResolver(), Settings.System.EGG_MODE, 0)
== 0) {
// For posterity: the moment this user unlocked the easter egg
Settings.System.putLong(getContentResolver(),
Settings.System.EGG_MODE,
System.currentTimeMillis());
}
try {
startActivity(new Intent(Intent.ACTION_MAIN)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
@@ -158,7 +166,7 @@ public class PlatLogoActivity extends Activity {
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
.addCategory("com.android.internal.category.PLATLOGO"));
} catch (ActivityNotFoundException ex) {
android.util.Log.e("PlatLogoActivity", "Couldn't find a piece of pie.");
android.util.Log.e("PlatLogoActivity", "Couldn't catch a break.");
}
finish();
return true;