From bbcf8b65670dc0f571669bdced0c0fc54250f17f Mon Sep 17 00:00:00 2001 From: Dan Sandler Date: Sun, 14 Feb 2016 22:24:43 -0500 Subject: [PATCH] N-release temporary platlogo. What are we going to do 13 releases from now, I wonder? Bug: 27315386 Change-Id: I65814f9cd686b3bac537565166b2a5d09a9b8f2b --- .../internal/app/PlatLogoActivity.java | 134 ++---------------- core/res/res/drawable-nodpi/platlogo.xml | 26 ++-- core/res/res/drawable-nodpi/stat_sys_adb.xml | 34 ++--- packages/SystemUI/res/drawable-nodpi/icon.xml | 35 ++--- 4 files changed, 57 insertions(+), 172 deletions(-) diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java index 0964dcf81722c..59445688aa7ec 100644 --- a/core/java/com/android/internal/app/PlatLogoActivity.java +++ b/core/java/com/android/internal/app/PlatLogoActivity.java @@ -73,62 +73,28 @@ public class PlatLogoActivity extends Activity { final int size = (int) (Math.min(Math.min(dm.widthPixels, dm.heightPixels), 600*dp) - 100*dp); - final View im = new View(this); + final ImageView im = new ImageView(this); + final int pad = (int)(40*dp); + im.setPadding(pad, pad, pad, pad); im.setTranslationZ(20); im.setScaleX(0.5f); im.setScaleY(0.5f); im.setAlpha(0f); - im.setOutlineProvider(new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - final int pad = (int) (8 * dp); - outline.setOval(pad, pad, view.getWidth() - pad, view.getHeight() - pad); - } - }); - final float hue = (float) Math.random(); - final Paint bgPaint = new Paint(); - bgPaint.setColor(HSBtoColor(hue, 0.4f, 1f)); - final Paint fgPaint = new Paint(); - fgPaint.setColor(HSBtoColor(hue, 0.5f, 1f)); - final Drawable M = getDrawable(com.android.internal.R.drawable.platlogo_m); - final Drawable platlogo = new Drawable() { - @Override - public void setAlpha(int alpha) { } - @Override - public void setColorFilter(@Nullable ColorFilter colorFilter) { } - - @Override - public int getOpacity() { - return PixelFormat.TRANSLUCENT; - } - - @Override - public void draw(Canvas c) { - final float r = c.getWidth() / 2f; - c.drawCircle(r, r, r, bgPaint); - c.drawArc(0, 0, 2 * r, 2 * r, 135, 180, false, fgPaint); - M.setBounds(0, 0, c.getWidth(), c.getHeight()); - M.draw(c); - } - }; im.setBackground(new RippleDrawable( ColorStateList.valueOf(0xFFFFFFFF), - platlogo, + getDrawable(com.android.internal.R.drawable.platlogo), null)); - im.setOutlineProvider(new ViewOutlineProvider() { - @Override - public void getOutline(View view, Outline outline) { - outline.setOval(0, 0, view.getWidth(), view.getHeight()); - } - }); +// im.setOutlineProvider(new ViewOutlineProvider() { +// @Override +// public void getOutline(View view, Outline outline) { +// outline.setOval(0, 0, view.getWidth(), view.getHeight()); +// } +// }); im.setClickable(true); im.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (mTapCount == 0) { - showMarshmallow(im); - } im.setOnLongClickListener(new View.OnLongClickListener() { @Override public boolean onLongClick(View v) { @@ -175,9 +141,6 @@ public class PlatLogoActivity extends Activity { @Override public boolean onKey(View v, int keyCode, KeyEvent event) { if (keyCode != KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) { - if (mKeyCount == 0) { - showMarshmallow(im); - } ++mKeyCount; if (mKeyCount > 2) { if (mTapCount > 5) { @@ -201,81 +164,4 @@ public class PlatLogoActivity extends Activity { .setStartDelay(800) .start(); } - - public void showMarshmallow(View im) { - final Drawable fg = getDrawable(com.android.internal.R.drawable.platlogo); - fg.setBounds(0, 0, im.getWidth(), im.getHeight()); - fg.setAlpha(0); - im.getOverlay().add(fg); - - final Animator fadeIn = ObjectAnimator.ofInt(fg, "alpha", 255); - fadeIn.setInterpolator(mInterpolator); - fadeIn.setDuration(300); - fadeIn.start(); - } - - /** - * Convert HSB components to an ARGB color. Alpha set to 0xFF. - * hsv[0] is Hue [0 .. 1) - * hsv[1] is Saturation [0...1] - * hsv[2] is Value [0...1] - * If hsv values are out of range, they are pinned. - * @param h Hue component - * @param s Saturation component - * @param b Brightness component - * @return the resulting argb color - */ - private static int HSBtoColor(float h, float s, float b) { - h = MathUtils.constrain(h, 0.0f, 1.0f); - s = MathUtils.constrain(s, 0.0f, 1.0f); - b = MathUtils.constrain(b, 0.0f, 1.0f); - - float red = 0.0f; - float green = 0.0f; - float blue = 0.0f; - - final float hf = (h - (int) h) * 6.0f; - final int ihf = (int) hf; - final float f = hf - ihf; - final float pv = b * (1.0f - s); - final float qv = b * (1.0f - s * f); - final float tv = b * (1.0f - s * (1.0f - f)); - - switch (ihf) { - case 0: // Red is the dominant color - red = b; - green = tv; - blue = pv; - break; - case 1: // Green is the dominant color - red = qv; - green = b; - blue = pv; - break; - case 2: - red = pv; - green = b; - blue = tv; - break; - case 3: // Blue is the dominant color - red = pv; - green = qv; - blue = b; - break; - case 4: - red = tv; - green = pv; - blue = b; - break; - case 5: // Red is the dominant color - red = b; - green = pv; - blue = qv; - break; - } - - return 0xFF000000 | (((int) (red * 255.0f)) << 16) | - (((int) (green * 255.0f)) << 8) | ((int) (blue * 255.0f)); - } - } diff --git a/core/res/res/drawable-nodpi/platlogo.xml b/core/res/res/drawable-nodpi/platlogo.xml index bb423fef57ba1..defa83a9b5c6d 100644 --- a/core/res/res/drawable-nodpi/platlogo.xml +++ b/core/res/res/drawable-nodpi/platlogo.xml @@ -1,5 +1,5 @@ + android:fillColor="#FF7E5BBF" + android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/> + android:fillColor="#FF7E5BBF" + android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/> + android:fillColor="#40000000" + android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/> + android:fillColor="#40000000" + android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/> + + diff --git a/core/res/res/drawable-nodpi/stat_sys_adb.xml b/core/res/res/drawable-nodpi/stat_sys_adb.xml index 8cc9961bf6e62..5043cba3aa5ef 100644 --- a/core/res/res/drawable-nodpi/stat_sys_adb.xml +++ b/core/res/res/drawable-nodpi/stat_sys_adb.xml @@ -1,5 +1,5 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="48.0" + android:viewportHeight="48.0"> + android:fillColor="#A0FFFFFF" + android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/> + android:fillColor="#A0FFFFFF" + android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/> - + android:fillColor="#40000000" + android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/> + + diff --git a/packages/SystemUI/res/drawable-nodpi/icon.xml b/packages/SystemUI/res/drawable-nodpi/icon.xml index 9c36b5a79c02e..5e08fcbf8f524 100644 --- a/packages/SystemUI/res/drawable-nodpi/icon.xml +++ b/packages/SystemUI/res/drawable-nodpi/icon.xml @@ -1,5 +1,5 @@ + android:fillColor="#00796B" + android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/> + android:fillColor="#00796B" + android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/> + android:fillColor="#40000000" + android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/> + android:fillColor="#40000000" + android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/> - - + android:fillColor="#4DB6AC" + android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/> + +