From 2c57c9c164dac1d54e8ffcc527543c89d40ff9b8 Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Thu, 9 Jun 2022 12:52:19 -0400 Subject: Android 1<3. Fixes: 216297617 Test: adb shell am start -n android/com.android.internal.app.PlatLogoActivity adjust clock to 13:00 for a bonus, long press on the bubbles Change-Id: I3d32d452c6dd7a7e69aad86a033aba09ae8625d5 --- .../com/android/internal/app/PlatLogoActivity.java | 70 +++++++++++++++++++--- core/res/AndroidManifest.xml | 2 +- core/res/res/drawable-nodpi/platlogo.xml | 28 ++++++--- 3 files changed, 82 insertions(+), 18 deletions(-) diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java index b7f6a615a452..bf265689c0e0 100644 --- a/core/java/com/android/internal/app/PlatLogoActivity.java +++ b/core/java/com/android/internal/app/PlatLogoActivity.java @@ -103,6 +103,7 @@ public class PlatLogoActivity extends Activity { mBg.padding = 0.5f * dp; mBg.minR = 1 * dp; layout.setBackground(mBg); + layout.setOnLongClickListener(mBg); setContentView(layout); } @@ -291,8 +292,8 @@ public class PlatLogoActivity extends Activity { return true; case MotionEvent.ACTION_UP: - if (mOverrideMinute == 0 && (mOverrideHour % 12) == 0) { - Log.v(TAG, "12:00 let's gooooo"); + if (mOverrideMinute == 0 && (mOverrideHour % 12) == 1) { + Log.v(TAG, "13:00"); performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); launchNextStage(false); } @@ -302,18 +303,45 @@ public class PlatLogoActivity extends Activity { } } + private static final String[][] EMOJI_SETS = { + {"๐Ÿ‡", "๐Ÿˆ", "๐Ÿ‰", "๐ŸŠ", "๐Ÿ‹", "๐ŸŒ", "๐Ÿ", "๐Ÿฅญ", "๐ŸŽ", "๐Ÿ", "๐Ÿ", "๐Ÿ‘", + "๐Ÿ’", "๐Ÿ“", "๐Ÿซ", "๐Ÿฅ"}, + {"๐Ÿ˜บ", "๐Ÿ˜ธ", "๐Ÿ˜น", "๐Ÿ˜ป", "๐Ÿ˜ผ", "๐Ÿ˜ฝ", "๐Ÿ™€", "๐Ÿ˜ฟ", "๐Ÿ˜พ"}, + {"๐Ÿ˜€", "๐Ÿ˜ƒ", "๐Ÿ˜„", "๐Ÿ˜", "๐Ÿ˜†", "๐Ÿ˜…", "๐Ÿคฃ", "๐Ÿ˜‚", "๐Ÿ™‚", "๐Ÿ™ƒ", "๐Ÿซ ", "๐Ÿ˜‰", "๐Ÿ˜Š", + "๐Ÿ˜‡", "๐Ÿฅฐ", "๐Ÿ˜", "๐Ÿคฉ", "๐Ÿ˜˜", "๐Ÿ˜—", "โ˜บ๏ธ", "๐Ÿ˜š", "๐Ÿ˜™", "๐Ÿฅฒ", "๐Ÿ˜‹", "๐Ÿ˜›", "๐Ÿ˜œ", + "๐Ÿคช", "๐Ÿ˜", "๐Ÿค‘", "๐Ÿค—", "๐Ÿคญ", "๐Ÿซข", "๐Ÿซฃ", "๐Ÿคซ", "๐Ÿค”", "๐Ÿซก", "๐Ÿค", "๐Ÿคจ", "๐Ÿ˜", + "๐Ÿ˜‘", "๐Ÿ˜ถ", "๐Ÿซฅ", "๐Ÿ˜", "๐Ÿ˜’", "๐Ÿ™„", "๐Ÿ˜ฌ", "๐Ÿคฅ", "๐Ÿ˜Œ", "๐Ÿ˜”", "๐Ÿ˜ช", "๐Ÿคค", "๐Ÿ˜ด", + "๐Ÿ˜ท"}, + { "๐Ÿคฉ", "๐Ÿ˜", "๐Ÿฅฐ", "๐Ÿ˜˜", "๐Ÿฅณ", "๐Ÿฅฒ", "๐Ÿฅน" }, + { "๐Ÿซ " }, + {"๐Ÿ’˜", "๐Ÿ’", "๐Ÿ’–", "๐Ÿ’—", "๐Ÿ’“", "๐Ÿ’ž", "๐Ÿ’•", "โฃ", "๐Ÿ’”", "โค", "๐Ÿงก", "๐Ÿ’›", + "๐Ÿ’š", "๐Ÿ’™", "๐Ÿ’œ", "๐ŸคŽ", "๐Ÿ–ค", "๐Ÿค"}, + // {"๐Ÿ‘", "๏ธ๐Ÿซฆ", "๐Ÿ‘๏ธ"}, // this one is too much + {"๐Ÿ‘ฝ", "๐Ÿ›ธ", "โœจ", "๐ŸŒŸ", "๐Ÿ’ซ", "๐Ÿš€", "๐Ÿช", "๐ŸŒ™", "โญ", "๐ŸŒ"}, + {"๐ŸŒ‘", "๐ŸŒ’", "๐ŸŒ“", "๐ŸŒ”", "๐ŸŒ•", "๐ŸŒ–", "๐ŸŒ—", "๐ŸŒ˜"}, + {"๐Ÿ™", "๐Ÿชธ", "๐Ÿฆ‘", "๐Ÿฆ€", "๐Ÿฆ", "๐Ÿก", "๐Ÿฆž", "๐Ÿ ", "๐ŸŸ", "๐Ÿณ", "๐Ÿ‹", "๐Ÿฌ", "๐Ÿซง", "๐ŸŒŠ", + "๐Ÿฆˆ"}, + {"๐Ÿ™ˆ", "๐Ÿ™‰", "๐Ÿ™Š", "๐Ÿต", "๐Ÿ’"}, + {"โ™ˆ", "โ™‰", "โ™Š", "โ™‹", "โ™Œ", "โ™", "โ™Ž", "โ™", "โ™", "โ™‘", "โ™’", "โ™“"}, + {"๐Ÿ•›", "๐Ÿ•ง", "๐Ÿ•", "๐Ÿ•œ", "๐Ÿ•‘", "๐Ÿ•", "๐Ÿ•’", "๐Ÿ•ž", "๐Ÿ•“", "๐Ÿ•Ÿ", "๐Ÿ•”", "๐Ÿ• ", "๐Ÿ••", "๐Ÿ•ก", + "๐Ÿ•–", "๐Ÿ•ข", "๐Ÿ•—", "๐Ÿ•ฃ", "๐Ÿ•˜", "๐Ÿ•ค", "๐Ÿ•™", "๐Ÿ•ฅ", "๐Ÿ•š", "๐Ÿ•ฆ"}, + {"๐ŸŒบ", "๐ŸŒธ", "๐Ÿ’ฎ", "๐Ÿต๏ธ", "๐ŸŒผ", "๐ŸŒฟ"}, + {"๐Ÿข", "โœจ", "๐ŸŒŸ", "๐Ÿ‘‘"} + }; + static class Bubble { public float x, y, r; public int color; + public String text = null; } - class BubblesDrawable extends Drawable { + class BubblesDrawable extends Drawable implements View.OnLongClickListener { private static final int MAX_BUBBS = 2000; private final int[] mColorIds = { - android.R.color.system_accent1_400, - android.R.color.system_accent1_500, - android.R.color.system_accent1_600, + android.R.color.system_accent3_400, + android.R.color.system_accent3_500, + android.R.color.system_accent3_600, android.R.color.system_accent2_400, android.R.color.system_accent2_500, @@ -322,6 +350,8 @@ public class PlatLogoActivity extends Activity { private int[] mColors = new int[mColorIds.length]; + private int mEmojiSet = -1; + private final Bubble[] mBubbs = new Bubble[MAX_BUBBS]; private int mNumBubbs; @@ -342,17 +372,34 @@ public class PlatLogoActivity extends Activity { @Override public void draw(Canvas canvas) { + if (getLevel() == 0) return; final float f = getLevel() / 10000f; mPaint.setStyle(Paint.Style.FILL); + mPaint.setTextAlign(Paint.Align.CENTER); int drawn = 0; for (int j = 0; j < mNumBubbs; j++) { if (mBubbs[j].color == 0 || mBubbs[j].r == 0) continue; - mPaint.setColor(mBubbs[j].color); - canvas.drawCircle(mBubbs[j].x, mBubbs[j].y, mBubbs[j].r * f, mPaint); + if (mBubbs[j].text != null) { + mPaint.setTextSize(mBubbs[j].r * 1.75f); + canvas.drawText(mBubbs[j].text, mBubbs[j].x, + mBubbs[j].y + mBubbs[j].r * f * 0.6f, mPaint); + } else { + mPaint.setColor(mBubbs[j].color); + canvas.drawCircle(mBubbs[j].x, mBubbs[j].y, mBubbs[j].r * f, mPaint); + } drawn++; } } + public void chooseEmojiSet() { + mEmojiSet = (int) (Math.random() * EMOJI_SETS.length); + final String[] emojiSet = EMOJI_SETS[mEmojiSet]; + for (int j = 0; j < mBubbs.length; j++) { + mBubbs[j].text = emojiSet[(int) (Math.random() * emojiSet.length)]; + } + invalidateSelf(); + } + @Override protected boolean onLevelChange(int level) { invalidateSelf(); @@ -423,6 +470,13 @@ public class PlatLogoActivity extends Activity { public int getOpacity() { return TRANSLUCENT; } + + @Override + public boolean onLongClick(View v) { + if (getLevel() == 0) return false; + chooseEmojiSet(); + return true; + } } } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index e52da0fd6787..7439b2f0921f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -6628,7 +6628,7 @@ android:process=":ui"> diff --git a/core/res/res/drawable-nodpi/platlogo.xml b/core/res/res/drawable-nodpi/platlogo.xml index f816d0c41349..da214868ca05 100644 --- a/core/res/res/drawable-nodpi/platlogo.xml +++ b/core/res/res/drawable-nodpi/platlogo.xml @@ -19,17 +19,27 @@ Copyright (C) 2021 The Android Open Source Project android:viewportWidth="24" xmlns:android="http://schemas.android.com/apk/res/android"> + android:pathData="M6.3,6.5l3,0l0,12.2" + android:strokeWidth="2.22" + android:strokeColor="@android:color/system_accent3_800" + /> + - + /> + - -- cgit v1.2.3-59-g8ed1b