Merge "N-release temporary platlogo." into nyc-dev (ab0037c8) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/PlatLogoActivity.java

+10 −124

Original line number	Diff line number	Diff line
		@@ -73,62 +73,28 @@ public class PlatLogoActivity extends Activity {
		final int size = (int)
		(Math.min(Math.min(dm.widthPixels, dm.heightPixels), 600dp) - 100dp);

		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));
		}

		}

core/res/res/drawable-nodpi/platlogo.xml

+15 −11

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2015 The Android Open Source Project
		Copyright (C) 2016 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		@@ -14,20 +14,24 @@ Copyright (C) 2015 The Android Open Source Project
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="48dp"
		android:height="48dp"
		android:width="512dp"
		android:height="512dp"
		android:viewportWidth="48.0"
		android:viewportHeight="48.0">
		<path
		android:pathData="M34.9,13.2c-0.8,-0.8,-4.2,-2.4,-10.9,-2.4s-10.1,1.6,-10.9,2.4c-0.8,0.8,-2.4,4.2,-2.4,10.9s1.6,10.1,2.4,10.9 c0.8,0.8,4.2,2.4,10.9,2.4s10.1,-1.6,10.9,-2.4c0.8,-0.8,2.4,-4.2,2.4,-10.9S35.6,14,34.9,13.2z"
		android:fillColor="#FFFFFF"/>
		android:fillColor="#FF7E5BBF"
		android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>
		<path
		android:pathData="M34.7,13.7c0,0.8,-1.2,1.5,-3.1,2.1c-1.9,0.5,-4.6,0.8,-7.6,0.8s-5.6,-0.3,-7.6,-0.8 c-1.9,-0.5,-3.1,-1.2,-3.1,-2.1s1.2,-1.5,3.1,-2.1c1.9,-0.5,4.6,-0.8,7.6,-0.8s5.6,0.3,7.6,0.8C33.5,12.1,34.7,12.9,34.7,13.7z"
		android:fillColor="#EBEBEB"/>
		android:fillColor="#FF7E5BBF"
		android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>
		<path
		android:pathData="M30,13c-0.1,0,-0.1,0,-0.2,0c-0.4,-0.1,-0.7,-0.6,-0.6,-1l1.3,-5.5c0.1,-0.4,0.6,-0.7,1,-0.6c0.4,0.1,0.7,0.6,0.6,1 l-1.3,5.5C30.7,12.7,30.4,13,30,13z"
		android:fillColor="#FFFFFF"/>
		android:fillColor="#40000000"
		android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/>
		<path
		android:pathData="M18,13c-0.4,0,-0.7,-0.3,-0.8,-0.6l-1.3,-5.5c-0.1,-0.4,0.2,-0.9,0.6,-1c0.4,-0.1,0.9,0.2,1,0.6l1.3,5.5 c0.1,0.4,-0.2,0.9,-0.6,1C18.1,13,18.1,13,18,13z"
		android:fillColor="#FFFFFF"/>
		android:fillColor="#40000000"
		android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>
		<path
		android:fillColor="#FF55C4F5"
		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"/>
		</vector>

core/res/res/drawable-nodpi/stat_sys_adb.xml

+17 −17

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2014 The Android Open Source Project
		Copyright (C) 2016 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		@@ -14,23 +14,23 @@ Copyright (C) 2014 The Android Open Source Project
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24.0dp"
		android:height="24.0dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="48.0"
		android:viewportHeight="48.0">
		<path
		android:pathData="M8.4,5.3c-0.2,0.0 -0.4,-0.2 -0.5,-0.4L7.1,1.6C7.0,1.4 7.2,1.1 7.4,1.0C7.7,0.9 8.0,1.1 8.0,1.4l0.8,3.3c0.1,0.3 -0.1,0.5 -0.4,0.6C8.5,5.3 8.4,5.3 8.4,5.3z"
		android:fillColor="#FFFFFF"/>
		android:fillColor="#A0FFFFFF"
		android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>
		<path
		android:pathData="M15.6,5.3c0.0,0.0 -0.1,0.0 -0.1,0.0c-0.3,-0.1 -0.4,-0.3 -0.4,-0.6L16.0,1.4C16.0,1.1 16.3,0.9 16.6,1.0c0.3,0.1 0.4,0.3 0.4,0.6l-0.8,3.3C16.1,5.1 15.9,5.3 15.6,5.3z"
		android:fillColor="#FFFFFF"/>
		android:fillColor="#A0FFFFFF"
		android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>
		<path
		android:pathData="M18.6,5.4c-0.1,-0.1 -0.2,-0.1 -0.3,-0.2c0.2,0.2 0.3,0.3 0.3,0.5c0.0,0.9 -2.9,1.7 -6.6,1.7S5.4,6.7 5.4,5.7c0.0,-0.2 0.1,-0.3 0.3,-0.5C5.6,5.3 5.5,5.4 5.4,5.4C5.0,5.9 4.0,8.0 4.0,12.0s1.0,6.1 1.4,6.6C5.9,19.0 8.0,20.0 12.0,20.0s6.1,-1.0 6.6,-1.4C19.0,18.1 20.0,16.0 20.0,12.0S19.0,5.9 18.6,5.4zM8.0,13.0c-0.6,0.0 -1.0,-0.4 -1.0,-1.0c0.0,-0.6 0.4,-1.0 1.0,-1.0s1.0,0.4 1.0,1.0C9.0,12.6 8.6,13.0 8.0,13.0zM16.0,13.0c-0.6,0.0 -1.0,-0.4 -1.0,-1.0c0.0,-0.6 0.4,-1.0 1.0,-1.0s1.0,0.4 1.0,1.0C17.0,12.6 16.6,13.0 16.0,13.0z"
		android:fillColor="#FFFFFF"/>
		android:fillColor="#40000000"
		android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/>
		<path
		android:pathData="M5.35,5.7
		a 6.6 1.75 0 1 1 13.25 0
		a 6.6 1.75 0 1 1 -13.25 0
		z"
		android:fillColor="#BBFFFFFF" />
		android:fillColor="#40000000"
		android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>
		<path
		android:fillColor="#FFFFFFFF"
		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"/>
		</vector>

packages/SystemUI/res/drawable-nodpi/icon.xml

+15 −20

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2015 The Android Open Source Project
		Copyright (C) 2016 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		@@ -14,30 +14,25 @@ Copyright (C) 2015 The Android Open Source Project
		limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="48.0dp"
		android:height="48.0dp"
		android:width="48dp"
		android:height="48dp"
		android:viewportWidth="48.0"
		android:viewportHeight="48.0">
		<path
		android:pathData="M24.0,2.0C11.8,2.0 2.0,11.8 2.0,24.0c0.0,6.1 2.5,11.6 6.4,15.6L39.6,8.4C35.6,4.5 30.1,2.0 24.0,2.0z"
		android:fillColor="#E91E63"/>
		android:fillColor="#00796B"
		android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>
		<path
		android:pathData="M39.6,8.4L8.4,39.6c4.0,4.0 9.5,6.4 15.6,6.4c12.2,0.0 22.0,-9.8 22.0,-22.0C46.0,17.9 43.5,12.4 39.6,8.4z"
		android:fillColor="#F06292"/>
		android:fillColor="#00796B"
		android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>
		<path
		android:pathData="M45.9,25.9L34.0,14.0L14.0,34.0l11.9,11.9C36.5,45.0 45.0,36.5 45.9,25.9z"
		android:fillAlpha="0.33"
		android:fillColor="#E91E63"/>
		android:fillColor="#40000000"
		android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/>
		<path
		android:pathData="M24.0,24.0c0.0,0.0 0.0,2.2 0.0,5.0s0.0,5.0 0.0,5.0l10.0,-10.0L34.0,14.0L24.0,24.0z"
		android:fillColor="#FFFFFF"/>
		android:fillColor="#40000000"
		android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>
		<path
		android:pathData="M24.0,24.0L14.0,14.0l0.0,10.0l10.0,10.0c0.0,0.0 0.0,-2.2 0.0,-5.0S24.0,24.0 24.0,24.0z"
		android:fillColor="#EEEEEE"/>
		<path
		android:pathData="M14.0,34.0l10.0,0.0 -10.0,-10.0z"
		android:fillColor="#DDDDDD"/>
		<path
		android:pathData="M34.0,34.0l0.0,-10.0 -10.0,10.0z"
		android:fillColor="#DDDDDD"/>
		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"/>
		</vector>