diff options
| -rw-r--r-- | core/java/com/android/internal/app/PlatLogoActivity.java | 72 | ||||
| -rw-r--r-- | core/res/res/drawable-nodpi/platlogo.xml | 211 | ||||
| -rw-r--r-- | core/res/res/drawable-nodpi/stat_sys_adb.xml | 127 |
3 files changed, 203 insertions, 207 deletions
diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java index b8f7a3d0231a..5d55418b185d 100644 --- a/core/java/com/android/internal/app/PlatLogoActivity.java +++ b/core/java/com/android/internal/app/PlatLogoActivity.java @@ -18,6 +18,9 @@ package com.android.internal.app; import static android.os.VibrationEffect.Composition.PRIMITIVE_SPIN; +import static java.lang.Math.hypot; +import static java.lang.Math.max; + import android.animation.ObjectAnimator; import android.animation.TimeAnimator; import android.annotation.SuppressLint; @@ -26,9 +29,11 @@ import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.ContentResolver; import android.content.Intent; +import android.content.pm.ActivityInfo; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.ColorFilter; +import android.graphics.ColorSpace; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.Rect; @@ -72,7 +77,7 @@ public class PlatLogoActivity extends Activity { private static final String EGG_UNLOCK_SETTING = "egg_mode_v"; private static final float MIN_WARP = 1f; - private static final float MAX_WARP = 10f; // after all these years + private static final float MAX_WARP = 16f; // must go faster private static final boolean FINISH_AFTER_NEXT_STAGE_LAUNCH = false; private ImageView mLogo; @@ -201,6 +206,9 @@ public class PlatLogoActivity extends Activity { getWindow().setStatusBarColor(0); getWindow().getDecorView().getWindowInsetsController().hide(WindowInsets.Type.systemBars()); + // This will be silently ignored on displays that don't support HDR color, which is fine + getWindow().setColorMode(ActivityInfo.COLOR_MODE_HDR); + final ActionBar ab = getActionBar(); if (ab != null) ab.hide(); @@ -364,7 +372,7 @@ public class PlatLogoActivity extends Activity { mPressureMin = Math.min(mPressureMin, touchData.getDouble("min")); } if (touchData.has("max")) { - mPressureMax = Math.max(mPressureMax, touchData.getDouble("max")); + mPressureMax = max(mPressureMax, touchData.getDouble("max")); } if (mPressureMax >= 0) { touchData.put("min", mPressureMin); @@ -392,9 +400,11 @@ public class PlatLogoActivity extends Activity { } private static class Starfield extends Drawable { - private static final int NUM_STARS = 34; // Build.VERSION_CODES.UPSIDE_DOWN_CAKE + private static final int NUM_STARS = 128; + + private static final int NUM_PLANES = 4; - private static final int NUM_PLANES = 2; + private static final float ROTATION = 45; private final float[] mStars = new float[NUM_STARS * 4]; private float mVx, mVy; private long mDt = 0; @@ -403,7 +413,7 @@ public class PlatLogoActivity extends Activity { private final Random mRng; private final float mSize; - private final Rect mSpace = new Rect(); + private float mRadius = 0f; private float mWarp = 1f; private float mBuffer; @@ -426,14 +436,15 @@ public class PlatLogoActivity extends Activity { @Override public void onBoundsChange(Rect bounds) { - mSpace.set(bounds); mBuffer = mSize * NUM_PLANES * 2 * MAX_WARP; - mSpace.inset(-(int) mBuffer, -(int) mBuffer); - final float w = mSpace.width(); - final float h = mSpace.height(); + mRadius = ((float) hypot(bounds.width(), bounds.height()) / 2f) + mBuffer; + // I didn't clarify this the last time, but we store both the beginning and + // end of each star's trail in this data structure. When we're not in warp that means + // that we've got each star in there twice. It's fine, we're gonna move it off-screen for (int i = 0; i < NUM_STARS; i++) { - mStars[4 * i] = mRng.nextFloat() * w; - mStars[4 * i + 1] = mRng.nextFloat() * h; + mStars[4 * i] = mRng.nextFloat() * 2 * mRadius - mRadius; + mStars[4 * i + 1] = mRng.nextFloat() * 2 * mRadius - mRadius; + // duplicate copy (for now) mStars[4 * i + 2] = mStars[4 * i]; mStars[4 * i + 3] = mStars[4 * i + 1]; } @@ -452,31 +463,47 @@ public class PlatLogoActivity extends Activity { final boolean inWarp = mWarp > 1f; - canvas.drawColor(Color.BLACK); // 0xFF16161D); + final float diameter = mRadius * 2f; + final float triameter = mRadius * 3f; + + canvas.drawColor(Color.BLACK); + + final float cx = getBounds().width() / 2f; + final float cy = getBounds().height() / 2f; + canvas.translate(cx, cy); + + canvas.rotate(ROTATION); if (mDt > 0 && mDt < 1000) { canvas.translate( - -(mBuffer) + mRng.nextFloat() * (mWarp - 1f), - -(mBuffer) + mRng.nextFloat() * (mWarp - 1f) + mRng.nextFloat() * (mWarp - 1f), + mRng.nextFloat() * (mWarp - 1f) ); - final float w = mSpace.width(); - final float h = mSpace.height(); for (int i = 0; i < NUM_STARS; i++) { final int plane = (int) ((((float) i) / NUM_STARS) * NUM_PLANES) + 1; - mStars[4 * i + 2] = (mStars[4 * i + 2] + dx * plane + w) % w; - mStars[4 * i + 3] = (mStars[4 * i + 3] + dy * plane + h) % h; - mStars[4 * i + 0] = inWarp ? mStars[4 * i + 2] - dx * mWarp * 2 * plane : -100; - mStars[4 * i + 1] = inWarp ? mStars[4 * i + 3] - dy * mWarp * 2 * plane : -100; + mStars[4 * i + 2] = (mStars[4 * i + 2] + dx * plane + triameter) % diameter + - mRadius; + mStars[4 * i + 3] = (mStars[4 * i + 3] + dy * plane + triameter) % diameter + - mRadius; + mStars[4 * i + 0] = inWarp ? mStars[4 * i + 2] - dx * mWarp * plane : -10000; + mStars[4 * i + 1] = inWarp ? mStars[4 * i + 3] - dy * mWarp * plane : -10000; } } final int slice = (mStars.length / NUM_PLANES / 4) * 4; for (int p = 0; p < NUM_PLANES; p++) { + final float value = (p + 1f) / (NUM_PLANES - 1); + mStarPaint.setColor(packHdrColor(value, 1.0f)); mStarPaint.setStrokeWidth(mSize * (p + 1)); if (inWarp) { canvas.drawLines(mStars, p * slice, slice, mStarPaint); } canvas.drawPoints(mStars, p * slice, slice, mStarPaint); } + + if (inWarp) { + final float frac = (mWarp - MIN_WARP) / (MAX_WARP - MIN_WARP); + canvas.drawColor(packHdrColor(2.0f, frac * frac)); + } } @Override @@ -497,5 +524,10 @@ public class PlatLogoActivity extends Activity { public void update(long dt) { mDt = dt; } + + private static final ColorSpace sSrgbExt = ColorSpace.get(ColorSpace.Named.EXTENDED_SRGB); + public static long packHdrColor(float value, float alpha) { + return Color.valueOf(value, value, value, alpha, sSrgbExt).pack(); + } } } diff --git a/core/res/res/drawable-nodpi/platlogo.xml b/core/res/res/drawable-nodpi/platlogo.xml index 822aa22746ca..74327964329c 100644 --- a/core/res/res/drawable-nodpi/platlogo.xml +++ b/core/res/res/drawable-nodpi/platlogo.xml @@ -1,5 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> <!-- -Copyright (C) 2021 The Android Open Source Project +Copyright (C) 2024 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. @@ -18,97 +19,129 @@ Copyright (C) 2021 The Android Open Source Project android:height="512dp" android:viewportWidth="512" android:viewportHeight="512"> - <!-- space --> - <path - android:pathData="M256,446.36C229.63,446.36 212.19,428.06 194.8,397.94C177.41,367.82 91.54,219.08 74.14,188.96C56.75,158.84 49.63,134.59 62.81,111.75C76,88.91 100.56,82.95 135.35,82.95C170.13,82.95 341.87,82.95 376.65,82.95C411.44,82.95 436,88.91 449.19,111.75C462.37,134.59 455.25,158.84 437.86,188.96C420.46,219.08 334.59,367.82 317.2,397.94C299.81,428.06 282.37,446.36 256,446.36H256Z" - android:fillColor="#202124"/> - <group> - <clip-path - android:pathData="M256,446.36C229.63,446.36 212.19,428.06 194.8,397.94C177.41,367.82 91.54,219.08 74.14,188.96C56.75,158.84 49.63,134.59 62.81,111.75C76,88.91 100.56,82.95 135.35,82.95C170.13,82.95 341.87,82.95 376.65,82.95C411.44,82.95 436,88.91 449.19,111.75C462.37,134.59 455.25,158.84 437.86,188.96C420.46,219.08 334.59,367.82 317.2,397.94C299.81,428.06 282.37,446.36 256,446.36H256Z"/> - <!-- thrust plume --> - <path - android:pathData="M253,153C249.82,187.48 225.67,262.17 167.98,285.04C110.3,307.92 73.96,318.12 63,320.36L256,399L449,320.36C438.04,318.12 401.7,307.92 344.02,285.04C286.33,262.17 262.18,187.48 259,153H256H253Z" - android:fillColor="#C6FF00" - android:fillType="evenOdd"/> - <path - android:pathData="M253,153C251.5,187.42 241.7,261.98 214.5,284.82C187.3,307.65 170.17,317.84 165,320.08L256,398.58L347,320.08C341.83,317.84 324.7,307.65 297.5,284.82C270.3,261.98 260.5,187.42 259,153H256H253Z" - android:fillColor="#ffffff" - android:fillType="evenOdd"/> - <path - android:pathData="M256,153m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" - android:fillColor="#ffffff"/> - <!-- android head and body --> - <path - android:pathData="M151,350h199v104h-199z" - android:fillColor="#5F6368"/> - <path - android:pathData="M358.42,350.44C358.36,350.02 358.29,349.6 358.22,349.18C357.8,346.6 357.27,344.04 356.65,341.52C355.57,337.12 354.21,332.82 352.59,328.66C351.22,325.13 349.66,321.7 347.93,318.38C345.7,314.11 343.18,310.01 340.41,306.11C337.01,301.34 333.21,296.86 329.06,292.74C327.32,291.01 325.52,289.34 323.65,287.73C319.62,284.26 315.32,281.09 310.78,278.26C310.82,278.19 310.85,278.12 310.89,278.05C312.97,274.46 315.05,270.88 317.13,267.29C319.17,263.78 321.2,260.28 323.23,256.77C324.69,254.26 326.15,251.74 327.61,249.22C327.95,248.62 328.22,248.01 328.43,247.37C329,245.61 329.02,243.76 328.57,242.03C328.45,241.61 328.31,241.19 328.14,240.78C327.97,240.38 327.77,239.98 327.54,239.6C326.76,238.29 325.65,237.16 324.26,236.33C323.02,235.6 321.64,235.16 320.23,235.03C319.64,234.98 319.04,234.99 318.45,235.05C317.96,235.1 317.47,235.19 316.99,235.32C315.26,235.77 313.67,236.72 312.42,238.08C311.98,238.57 311.58,239.12 311.23,239.71C309.77,242.23 308.31,244.75 306.85,247.27L300.76,257.78C298.68,261.37 296.6,264.96 294.52,268.55C294.29,268.94 294.06,269.33 293.83,269.73C293.52,269.6 293.21,269.48 292.89,269.36C281.43,264.99 269,262.6 256.01,262.6C255.65,262.6 255.3,262.6 254.94,262.6C243.39,262.72 232.29,264.73 221.93,268.33C220.73,268.75 219.55,269.19 218.38,269.65C218.16,269.29 217.95,268.92 217.74,268.55C215.66,264.96 213.58,261.38 211.5,257.79C209.47,254.28 207.43,250.78 205.4,247.27C203.94,244.76 202.48,242.23 201.02,239.72C200.68,239.12 200.28,238.58 199.83,238.09C198.59,236.72 196.99,235.78 195.27,235.32C194.79,235.2 194.3,235.1 193.81,235.05C193.22,234.99 192.62,234.99 192.03,235.04C190.61,235.16 189.23,235.6 188,236.34C186.6,237.16 185.5,238.3 184.71,239.6C184.49,239.99 184.29,240.38 184.12,240.79C183.95,241.2 183.8,241.61 183.69,242.04C183.23,243.76 183.26,245.62 183.82,247.38C184.03,248.01 184.3,248.63 184.65,249.23C186.11,251.74 187.57,254.26 189.02,256.78C191.06,260.28 193.09,263.79 195.12,267.29C197.2,270.88 199.28,274.47 201.36,278.06C201.38,278.09 201.4,278.12 201.41,278.15C197.22,280.76 193.23,283.64 189.47,286.8C187.21,288.69 185.04,290.68 182.96,292.75C178.81,296.87 175.01,301.35 171.6,306.12C168.82,310.02 166.31,314.11 164.09,318.39C162.35,321.71 160.79,325.14 159.42,328.67C157.8,332.83 156.44,337.13 155.36,341.53C154.75,344.05 154.22,346.6 153.79,349.19C153.72,349.61 153.66,350.03 153.59,350.45C153.36,351.95 153.16,353.46 153,354.98L359,354.98C358.84,353.46 358.64,351.95 358.41,350.45L358.42,350.44Z" - android:fillColor="#5F6368"/> - </group> - <!-- stars --> - <group> - <path - android:pathData="M131.04,134.34H127V138.38H131.04V134.34Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M167.04,256H163V260.04H167.04V256Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M373.49,127H369.45V131.04H373.49V127Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M292.04,226H288V230.04H292.04V226Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M319.04,186.91H315V190.95H319.04V186.91Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M355.04,222H351V226.04H355.04V222Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M192.04,136H188V140.04H192.04V136Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M336.08,196H328V204.08H336.08V196Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M222.04,212H218V216.04H222.04V212Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M163.08,175H155V183.08H163.08V175Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M211.08,143H203V151.08H211.08V143Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M369.08,204H361V212.08H369.08V204Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M169.21,204.34H161.13V212.42H169.21V204.34Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M383.04,160.07H374.95V168.15H383.04V160.07Z" - android:fillColor="#ffffff"/> - <path - android:pathData="M192.08,183H184V191.08H192.08V183Z" - android:fillColor="#ffffff"/> - </group> - <!-- patch frame --> - <path - android:pathData="M256,446.36C229.63,446.36 212.19,428.06 194.8,397.94C177.41,367.82 91.54,219.08 74.14,188.96C56.75,158.84 49.63,134.59 62.81,111.75C76,88.91 100.56,82.95 135.35,82.95C170.13,82.95 341.87,82.95 376.65,82.95C411.44,82.95 436,88.91 449.19,111.75C462.37,134.59 455.25,158.84 437.86,188.96C420.46,219.08 334.59,367.82 317.2,397.94C299.81,428.06 282.37,446.36 256,446.36H256Z" + <path + android:pathData="M127,58.5L385,58.5A68.5,68.5 0,0 1,453.5 127L453.5,385A68.5,68.5 0,0 1,385 453.5L127,453.5A68.5,68.5 0,0 1,58.5 385L58.5,127A68.5,68.5 0,0 1,127 58.5z" android:strokeWidth="55" + android:fillColor="#1D2126" + android:strokeColor="#4285F4"/> + <path + android:pathData="M152.157,72C149.469,72 148.125,72 148.125,72C148.125,72 148.581,70.818 149.493,68.454L157.269,48.222C157.773,46.89 158.025,46.224 158.025,46.224C158.025,46.224 158.913,46.224 160.689,46.224C162.405,46.224 163.263,46.224 163.263,46.224C163.263,46.224 163.521,46.884 164.037,48.204L171.759,68.418C172.683,70.806 173.145,72 173.145,72C173.145,72 171.831,72 169.203,72C167.643,72 166.863,72 166.863,72C166.863,72 166.683,71.448 166.323,70.344L161.481,56.376L160.617,53.496H160.509L159.645,56.358L154.767,70.308C154.419,71.436 154.245,72 154.245,72C154.245,72 153.549,72 152.157,72ZM152.949,66.996L154.479,62.874H166.287L167.871,66.996H152.949ZM186.631,72C184.759,72 183.823,72 183.823,72C183.823,72 183.823,71.148 183.823,69.444V49.59C183.823,47.346 183.823,46.224 183.823,46.224C183.823,46.224 185.065,46.224 187.549,46.224C189.001,46.224 189.727,46.224 189.727,46.224C189.727,46.224 190.021,46.686 190.609,47.61L199.807,62.046H199.915L199.807,58.05V48.708C199.807,47.052 199.807,46.224 199.807,46.224C199.807,46.224 200.737,46.224 202.597,46.224C204.469,46.224 205.405,46.224 205.405,46.224C205.405,46.224 205.405,47.052 205.405,48.708V69.012C205.405,71.004 205.405,72 205.405,72C205.405,72 204.307,72 202.111,72C200.839,72 200.203,72 200.203,72C200.203,72 199.945,71.604 199.429,70.812L189.421,55.53H189.295L189.421,59.508V69.444C189.421,71.148 189.421,72 189.421,72C189.421,72 188.491,72 186.631,72ZM221.683,72C219.559,72 218.497,72 218.497,72C218.497,72 218.497,70.932 218.497,68.796V49.41C218.497,47.286 218.497,46.224 218.497,46.224C218.497,46.224 219.559,46.224 221.683,46.224H227.677C231.613,46.224 234.787,47.406 237.199,49.77C239.611,52.122 240.817,55.23 240.817,59.094C240.817,62.982 239.611,66.108 237.199,68.472C234.787,70.824 231.613,72 227.677,72H221.683ZM224.293,66.852H227.353C229.681,66.876 231.523,66.21 232.879,64.854C234.247,63.486 234.931,61.584 234.931,59.148C234.931,56.736 234.253,54.864 232.897,53.532C231.541,52.2 229.693,51.534 227.353,51.534H224.293V66.852ZM255.401,72C253.469,72 252.503,72 252.503,72C252.503,72 252.503,71.13 252.503,69.39V49.41C252.503,47.286 252.503,46.224 252.503,46.224C252.503,46.224 253.565,46.224 255.689,46.224H262.763C265.319,46.224 267.467,46.98 269.207,48.492C270.959,50.004 271.835,52.02 271.835,54.54C271.835,56.904 271.001,58.848 269.333,60.372C267.677,61.884 265.517,62.64 262.853,62.64H254.915V58.482H262.205C263.285,58.482 264.191,58.146 264.923,57.474C265.667,56.79 266.039,55.896 266.039,54.792C266.039,53.796 265.679,52.962 264.959,52.29C264.251,51.606 263.381,51.264 262.349,51.264H258.299V69.39C258.299,71.13 258.299,72 258.299,72C258.299,72 257.333,72 255.401,72ZM268.703,72C267.551,72 266.975,72 266.975,72C266.975,72 266.759,71.664 266.327,70.992L259.487,60.444L265.607,60.228L270.917,68.004C272.765,70.668 273.689,72 273.689,72C273.689,72 272.027,72 268.703,72ZM295.491,72.594C291.771,72.594 288.603,71.346 285.987,68.85C283.383,66.342 282.081,63.09 282.081,59.094C282.081,55.086 283.389,51.84 286.005,49.356C288.633,46.872 291.789,45.63 295.473,45.63C299.157,45.63 302.313,46.89 304.941,49.41C307.569,51.918 308.883,55.146 308.883,59.094C308.883,63.018 307.575,66.252 304.959,68.796C302.355,71.328 299.199,72.594 295.491,72.594ZM295.473,66.996C297.645,66.996 299.451,66.252 300.891,64.764C302.343,63.264 303.069,61.374 303.069,59.094C303.069,56.79 302.343,54.906 300.891,53.442C299.439,51.966 297.633,51.228 295.473,51.228C293.337,51.228 291.537,51.966 290.073,53.442C288.621,54.918 287.895,56.802 287.895,59.094C287.895,61.386 288.615,63.276 290.055,64.764C291.507,66.252 293.313,66.996 295.473,66.996ZM323.519,72C321.563,72 320.585,72 320.585,72C320.585,72 320.585,71.118 320.585,69.354V48.87C320.585,47.106 320.585,46.224 320.585,46.224C320.585,46.224 321.563,46.224 323.519,46.224C325.475,46.224 326.453,46.224 326.453,46.224C326.453,46.224 326.453,47.106 326.453,48.87V69.354C326.453,71.118 326.453,72 326.453,72C326.453,72 325.475,72 323.519,72ZM342.73,72C340.606,72 339.544,72 339.544,72C339.544,72 339.544,70.932 339.544,68.796V49.41C339.544,47.286 339.544,46.224 339.544,46.224C339.544,46.224 340.606,46.224 342.73,46.224H348.724C352.66,46.224 355.834,47.406 358.246,49.77C360.658,52.122 361.864,55.23 361.864,59.094C361.864,62.982 360.658,66.108 358.246,68.472C355.834,70.824 352.66,72 348.724,72H342.73ZM345.34,66.852H348.4C350.728,66.876 352.57,66.21 353.926,64.854C355.294,63.486 355.978,61.584 355.978,59.148C355.978,56.736 355.3,54.864 353.944,53.532C352.588,52.2 350.74,51.534 348.4,51.534H345.34V66.852Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M196.971,198.17H257.84L196.971,259.04V198.17Z" + android:fillColor="#1F8E3D"/> + <path + android:pathData="M318.709,319.909L257.84,319.909L318.709,259.04L318.709,319.909Z" + android:fillColor="#1F8E3D"/> + <path + android:pathData="M318.709,198.17L318.709,259.04L257.84,198.17L318.709,198.17Z" + android:fillColor="#34A853"/> + <path + android:pathData="M196.971,319.909L196.971,259.04L257.84,319.909L196.971,319.909Z" + android:fillColor="#34A853"/> + <path + android:pathData="M257.84,259.04L196.971,259.04L257.84,198.171L257.84,259.04Z" + android:fillColor="#34A853"/> + <path + android:pathData="M257.84,198.17L196.971,198.17L257.84,137.301L257.84,198.17Z" + android:fillColor="#34A853"/> + <path + android:pathData="M257.84,319.909L318.709,319.909L257.84,380.778L257.84,319.909Z" + android:fillColor="#34A853"/> + <path + android:pathData="M257.84,259.04L318.709,259.04L257.84,319.91L257.84,259.04Z" + android:fillColor="#34A853"/> + <path + android:pathData="M318.709,259.04L379.579,259.04L318.709,319.91L318.709,259.04Z" + android:fillColor="#34A853"/> + <path + android:pathData="M196.971,259.04L136.101,259.04L196.971,198.171L196.971,259.04Z" + android:fillColor="#34A853"/> + <path + android:pathData="M257.84,259.04L257.84,198.171L318.709,259.04L257.84,259.04Z" + android:fillColor="#1F8E3D"/> + <path + android:pathData="M257.84,198.17L257.84,137.301L318.709,198.17L257.84,198.17Z" + android:fillColor="#1F8E3D"/> + <path + android:pathData="M257.84,319.909L257.84,380.778L196.971,319.909L257.84,319.909Z" + android:fillColor="#1F8E3D"/> + <path + android:pathData="M318.709,259.04L318.709,198.171L379.579,259.04L318.709,259.04Z" + android:fillColor="#1F8E3D"/> + <path + android:pathData="M196.971,259.04L196.971,319.91L136.101,259.04L196.971,259.04Z" + android:fillColor="#1F8E3D"/> + <path + android:pathData="M257.84,259.04L257.84,319.91L196.971,259.04L257.84,259.04Z" + android:fillColor="#1F8E3D"/> + <path + android:pathData="M342.409,405.074C340.766,405.074 339.348,404.477 338.153,403.282C336.989,402.088 336.406,400.654 336.406,398.982V355.485L328.567,361.129C327.462,361.935 326.222,362.219 324.849,361.98C323.475,361.741 322.385,361.054 321.579,359.919C320.772,358.785 320.488,357.53 320.727,356.157C320.996,354.753 321.683,353.633 322.788,352.797L339.497,340.881C339.915,340.582 340.363,340.314 340.841,340.075C341.319,339.806 341.961,339.671 342.767,339.671C344.35,339.671 345.679,340.239 346.754,341.374C347.859,342.479 348.412,343.852 348.412,345.495V398.982C348.412,400.654 347.814,402.088 346.62,403.282C345.455,404.477 344.051,405.074 342.409,405.074ZM382.377,405.522C375.449,405.522 369.804,403.447 365.444,399.296C361.114,395.144 358.949,389.873 358.949,383.482C358.949,379.122 359.919,375.046 361.86,371.253C363.831,367.46 366.534,363.339 369.969,358.889L382.646,342.538C383.572,341.344 384.766,340.627 386.23,340.388C387.723,340.149 389.082,340.448 390.306,341.284C391.68,342.27 392.486,343.554 392.725,345.137C392.964,346.719 392.546,348.153 391.471,349.437L383.452,359.651C382.228,361.174 379.719,363.309 375.926,366.057C372.164,368.804 369.595,374.553 368.221,383.303L361.726,383.258C362.652,376.21 365.504,371.029 370.282,367.714C375.09,364.399 380.272,362.742 385.826,362.742C391.322,362.742 396.01,364.653 399.893,368.476C403.775,372.268 405.716,377.211 405.716,383.303C405.716,389.724 403.521,395.04 399.131,399.251C394.771,403.432 389.186,405.522 382.377,405.522ZM382.332,395.04C385.826,395.04 388.693,393.965 390.933,391.815C393.203,389.664 394.338,386.902 394.338,383.527C394.338,380.212 393.203,377.48 390.933,375.329C388.693,373.149 385.856,372.059 382.422,372.059C378.958,372.059 376.076,373.149 373.776,375.329C371.507,377.48 370.372,380.227 370.372,383.572C370.372,386.887 371.492,389.634 373.731,391.815C376.001,393.965 378.868,395.04 382.332,395.04Z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M265.087,135.953L380.927,251.793A10.249,10.249 90,0 1,380.927 266.287L265.087,382.126A10.249,10.249 90,0 1,250.593 382.126L134.753,266.287A10.249,10.249 0,0 1,134.753 251.793L250.593,135.953A10.249,10.249 90,0 1,265.087 135.953z" + android:strokeWidth="14.3349" android:fillColor="#00000000" - android:strokeColor="#34A853"/> - <!-- text: ANDROID --> + android:strokeColor="#5F6368"/> + <path + android:pathData="M172.353,318.422C172.818,317.837 172.778,316.987 172.249,316.459V316.459C171.631,315.841 170.606,315.905 170.06,316.587C133.391,362.417 114.184,398.637 123.921,408.374C138.509,422.962 212.535,372.586 289.264,295.857C296.618,288.503 303.729,281.175 310.565,273.921C311.305,273.135 311.286,271.903 310.522,271.139L306.337,266.954C305.538,266.156 304.238,266.176 303.463,266.998C296.672,274.202 289.587,281.503 282.248,288.842C212.272,358.818 145.748,405.747 133.662,393.66C126.026,386.024 141.946,356.659 172.353,318.422Z" + android:fillColor="#C6FF00" + android:fillType="evenOdd"/> + <path + android:pathData="M347.267,248.089C348.867,247.66 350.512,248.61 350.941,250.21C351.37,251.81 350.42,253.455 348.82,253.884L347.267,248.089ZM348.82,253.884L321.452,261.217L319.899,255.422L347.267,248.089L348.82,253.884Z" + android:fillColor="#000000"/> + <path + android:pathData="M325.111,230.175C325.54,228.575 327.185,227.625 328.785,228.054C330.386,228.483 331.335,230.128 330.907,231.728L325.111,230.175ZM330.907,231.728L323.573,259.096L317.778,257.543L325.111,230.175L330.907,231.728Z" + android:fillColor="#000000"/> + <path + android:pathData="M335.665,242.984C327.494,234.813 314.434,234.623 306.498,242.559L288.774,260.283C287.243,261.814 287.243,264.3 288.774,265.831C290.306,267.363 292.791,267.363 294.323,265.831L299.1,261.054C302.165,257.989 307.132,257.989 310.197,261.054L317.595,268.452C320.66,271.517 320.66,276.484 317.595,279.549L312.818,284.326C311.286,285.858 311.286,288.344 312.818,289.875C314.349,291.406 316.835,291.406 318.366,289.875L336.09,272.151C344.026,264.215 343.836,251.155 335.665,242.984Z" + android:fillColor="#000000"/> + <path + android:pathData="M123.071,117.004l7.071,7.071l-7.071,7.071l-7.071,-7.071z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M108.071,332l7.071,7.071l-7.071,7.071l-7.071,-7.071z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M120.607,299l10.607,10.607l-10.607,10.607l-10.607,-10.607z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M123.071,183.435l7.071,7.071l-7.071,7.071l-7.071,-7.071z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M174.606,137l10.607,10.607l-10.607,10.607l-10.607,-10.607z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M145.214,139.149l7.071,7.071l-7.071,7.071l-7.071,-7.071z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M215.607,385l10.607,10.607l-10.607,10.607l-10.607,-10.607z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M227.071,110l7.071,7.071l-7.071,7.071l-7.071,-7.071z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M400.569,124.075l-7.071,7.071l-7.071,-7.071l7.071,-7.071z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M388.213,149.606l-10.607,10.607l-10.607,-10.607l10.607,-10.607z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M331.142,121.071l-7.071,7.071l-7.071,-7.071l7.071,-7.071z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M338.142,153.071l-7.071,7.071l-7.071,-7.071l7.071,-7.071z" + android:fillColor="#E8F5E9"/> + <path + android:pathData="M374.142,320.071l-7.071,7.071l-7.071,-7.071l7.071,-7.071z" + android:fillColor="#E8F5E9"/> <path - android:pathData="M170.11,92.71C170.97,94.9 171.41,96 171.41,96C171.41,96 170.37,96 168.29,96C166.22,96 165.18,96 165.18,96C165.18,96 164.93,95.27 164.42,93.82L159.71,80.63L158.82,77.75H158.61L157.82,80.63L153.28,93.82C152.82,95.27 152.6,96 152.6,96C152.6,96 151.54,96 149.43,96C147.33,96 146.28,96 146.28,96C146.28,96 146.7,94.89 147.56,92.67L155.21,72.87C155.89,71.07 156.23,70.17 156.23,70.17C156.23,70.17 157.06,70.17 158.72,70.17C160.52,70.17 161.42,70.17 161.42,70.17C161.42,70.17 161.76,71.07 162.46,72.87L170.11,92.71ZM166.04,91.12H158.64V86.91H164.42L166.04,91.12ZM158.64,91.12H151.08L152.63,86.91H158.64V91.12ZM203.85,93.46C203.85,95.15 203.85,96 203.85,96C203.85,96 202.95,96 201.15,96C199.38,96 198.5,96 198.5,96C198.5,96 198.03,95.26 197.08,93.79L188.08,79.75H187.88L188.01,83.45V93.25C188.01,95.08 188.01,96 188.01,96C188.01,96 187.03,96 185.09,96C183.15,96 182.17,96 182.17,96C182.17,96 182.17,95.08 182.17,93.25L182.16,73.9C182.16,71.45 182.16,70.22 182.16,70.22C182.16,70.22 183.19,70.22 185.25,70.22C187.24,70.22 188.24,70.22 188.24,70.22C188.24,70.22 188.7,70.96 189.63,72.42L198.16,85.85H198.36L198.21,82.09V72.89C198.21,71.11 198.21,70.22 198.21,70.22C198.21,70.22 199.15,70.22 201.04,70.22C202.91,70.22 203.85,70.22 203.85,70.22C203.85,70.22 203.85,71.11 203.85,72.89V93.46ZM226.52,96H220.17C218.24,96 217.27,96 217.27,96C217.27,96 217.27,95.02 217.27,93.05V73.19C217.27,71.21 217.27,70.22 217.27,70.22C217.27,70.22 218.24,70.22 220.17,70.22H226.52C230.46,70.22 233.63,71.41 236.03,73.77C238.43,76.12 239.63,79.23 239.63,83.09C239.63,86.98 238.43,90.11 236.03,92.47C233.63,94.82 230.46,96 226.52,96ZM223.17,75.64V90.74H226.18C228.46,90.77 230.27,90.11 231.62,88.78C232.96,87.44 233.63,85.57 233.63,83.17C233.63,80.78 232.96,78.93 231.62,77.62C230.28,76.3 228.47,75.64 226.18,75.64H223.17ZM257.51,93.23C257.51,95.08 257.51,96 257.51,96C257.51,96 256.54,96 254.6,96C252.66,96 251.7,96 251.7,96C251.7,96 251.7,95.09 251.7,93.26V73.19C251.7,71.21 251.7,70.22 251.7,70.22C251.7,70.22 252.66,70.22 254.6,70.22H261.89C264.44,70.22 266.6,70.98 268.35,72.49C270.1,74 270.98,76.03 270.98,78.56C270.98,80.9 270.14,82.83 268.47,84.35C266.81,85.87 264.65,86.62 262.01,86.62H254.02V82.41H261.33C262.4,82.41 263.29,82.08 264.01,81.42C264.73,80.75 265.09,79.88 265.09,78.81C265.09,77.84 264.74,77.03 264.05,76.38C263.35,75.72 262.49,75.39 261.47,75.39H257.51V93.23ZM264.77,93.82L258.66,84.46L264.8,84.25L271.23,93.62C272.37,95.21 272.94,96 272.94,96C272.94,96 271.82,96 269.57,96C267.3,96 266.17,96 266.17,96C266.17,96 265.7,95.27 264.77,93.82ZM296.04,96.58C292.33,96.58 289.16,95.33 286.52,92.85C283.89,90.37 282.58,87.11 282.58,83.09C282.58,79.07 283.9,75.83 286.54,73.36C289.19,70.88 292.36,69.65 296.04,69.65C299.71,69.65 302.87,70.9 305.51,73.41C308.16,75.91 309.49,79.13 309.49,83.09C309.49,87.03 308.17,90.26 305.53,92.8C302.9,95.32 299.74,96.58 296.04,96.58ZM296.04,90.83C298.19,90.83 299.98,90.1 301.41,88.64C302.85,87.17 303.57,85.33 303.57,83.09C303.57,80.84 302.84,78.99 301.39,77.55C299.95,76.11 298.17,75.39 296.04,75.39C293.92,75.39 292.13,76.12 290.68,77.57C289.24,79.01 288.52,80.85 288.52,83.09C288.52,85.35 289.23,87.2 290.66,88.66C292.1,90.11 293.89,90.83 296.04,90.83ZM327.64,93.05C327.64,95.02 327.64,96 327.64,96C327.64,96 326.63,96 324.61,96C322.59,96 321.57,96 321.57,96C321.57,96 321.57,95.02 321.57,93.05V73.18C321.57,71.21 321.57,70.22 321.57,70.22C321.57,70.22 322.58,70.22 324.6,70.22C326.63,70.22 327.64,70.22 327.64,70.22C327.64,70.22 327.64,71.21 327.64,73.18V93.05ZM350.31,96H343.96C342.03,96 341.06,96 341.06,96C341.06,96 341.06,95.02 341.06,93.05V73.19C341.06,71.21 341.06,70.22 341.06,70.22C341.06,70.22 342.03,70.22 343.96,70.22H350.31C354.25,70.22 357.42,71.41 359.82,73.77C362.22,76.12 363.42,79.23 363.42,83.09C363.42,86.98 362.22,90.11 359.82,92.47C357.42,94.82 354.25,96 350.31,96ZM346.96,75.64V90.74H349.97C352.25,90.77 354.06,90.11 355.41,88.78C356.75,87.44 357.42,85.57 357.42,83.17C357.42,80.78 356.75,78.93 355.41,77.62C354.07,76.3 352.26,75.64 349.97,75.64H346.96Z" - android:fillColor="#E9F3EB"/> - <!-- text: 15 --> + android:pathData="M307.213,109.607l-10.607,10.607l-10.607,-10.607l10.607,-10.607z" + android:fillColor="#E8F5E9"/> <path - android:pathData="M236.59,363.25C236.59,365.75 236.59,367 236.59,367C236.59,367 235.32,367 232.79,367C230.32,367 229.09,367 229.09,367C229.09,367 229.09,365.75 229.09,363.25V305.85L216.64,314.75C215,315.92 214.19,316.5 214.19,316.5C214.19,316.5 213.54,315.5 212.24,313.5C210.97,311.6 210.34,310.65 210.34,310.65C210.34,310.62 211.2,309.98 212.94,308.75L227.64,298.2C230.3,296.23 231.64,295.25 231.64,295.25C231.64,295.25 232.1,295.25 233.04,295.25C235.4,295.25 236.59,295.25 236.59,295.25C236.59,295.25 236.59,296.47 236.59,298.9V363.25ZM247.09,330L251.19,299C251.52,296.6 251.69,295.4 251.69,295.4C251.69,295.4 252.77,295.4 254.94,295.4H284.54C286.97,295.4 288.19,295.4 288.19,295.4C288.19,295.4 288.19,296.58 288.19,298.95C288.19,301.48 288.19,302.75 288.19,302.75C288.19,302.75 286.97,302.75 284.54,302.75H257.49L254.19,327.45L254.39,327.5C256.09,325.77 258.27,324.38 260.94,323.35C263.61,322.28 266.65,321.75 270.09,321.75C276.55,321.75 281.99,323.97 286.39,328.4C290.79,332.8 292.99,338.32 292.99,344.95C292.99,351.75 290.8,357.4 286.44,361.9C282.11,366.37 276.42,368.6 269.39,368.6C263.09,368.6 257.77,367 253.44,363.8C249.1,360.6 246.26,356.85 244.89,352.55C244.26,350.32 243.94,349.2 243.94,349.2C243.94,349.2 245.09,348.77 247.39,347.9C249.79,347 250.99,346.55 250.99,346.55C250.99,346.55 251.3,347.73 251.94,350.1C252.8,352.73 254.71,355.27 257.64,357.7C260.61,360.13 264.44,361.35 269.14,361.35C274.27,361.35 278.24,359.88 281.04,356.95C283.84,353.98 285.24,350.03 285.24,345.1C285.24,340.37 283.67,336.52 280.54,333.55C277.44,330.58 273.4,329.1 268.44,329.1C265.47,329.1 262.95,329.52 260.89,330.35C258.82,331.15 257.09,332.28 255.69,333.75C254.39,335.25 253.74,336 253.74,336C253.74,336 252.55,335.52 250.19,334.55C247.85,333.62 246.69,333.15 246.69,333.15C246.69,333.15 246.82,332.1 247.09,330Z" - android:fillColor="#E9F3EB"/> - <!-- spacecraft --> + android:pathData="M181.142,353.071l-7.071,7.071l-7.071,-7.071l7.071,-7.071z" + android:fillColor="#E8F5E9"/> <path - android:pathData="M256.12,121C249.43,121 244,126.27 244,132.77V147.29C244,148.54 245.02,149.56 246.27,149.56C247.53,149.56 248.55,148.55 248.55,147.29V143.38C248.55,140.87 250.58,138.83 253.09,138.83H259.15C261.66,138.83 263.7,140.87 263.7,143.38V147.29C263.7,148.54 264.71,149.56 265.97,149.56C267.23,149.56 268.24,148.55 268.24,147.29V132.77C268.24,126.27 262.82,121 256.12,121H256.12Z" - android:fillColor="#E9F3EB"/> + android:pathData="M400.573,190.501l-10.607,10.607l-10.607,-10.607l10.607,-10.607z" + android:fillColor="#E8F5E9"/> </vector> diff --git a/core/res/res/drawable-nodpi/stat_sys_adb.xml b/core/res/res/drawable-nodpi/stat_sys_adb.xml index 6ce4b9d13123..973010ec41ef 100644 --- a/core/res/res/drawable-nodpi/stat_sys_adb.xml +++ b/core/res/res/drawable-nodpi/stat_sys_adb.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2024 The Android Open Source Project @@ -13,7 +14,6 @@ Copyright (C) 2024 The Android Open Source Project See the License for the specific language governing permissions and limitations under the License. --> - <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" @@ -21,104 +21,35 @@ Copyright (C) 2024 The Android Open Source Project android:viewportHeight="24"> <group> <clip-path - android:pathData=" - M12.6495 17.375 - C12.3608 17.875 11.6392 17.875 11.3505 17.375 - L3.98927 4.625 - C3.70059 4.125 4.06143 3.5 4.63878 3.5 - L19.3612 3.5 - C19.9386 3.5 20.2994 4.125 20.0107 4.625 - L12.6495 17.375 - Z - "/> + android:pathData="M0,0h24v24h-24z"/> + <path + android:pathData="M12,8V12H8L12,8Z" + android:fillColor="#D9D9D9"/> + <path + android:pathData="M12,4V8H8L12,4Z" + android:fillColor="#D9D9D9"/> + <path + android:pathData="M8,8V12H4L8,8Z" + android:fillColor="#D9D9D9"/> + <path + android:pathData="M12,16L12,12L16,12L12,16Z" + android:fillColor="#D9D9D9"/> <path - android:pathData="M5,12 h14v9.8h-14z" - android:fillColor="#ffffff"/> + android:pathData="M12,20L12,16L16,16L12,20Z" + android:fillColor="#D9D9D9"/> <path - android:pathData=" - M15.97 10.48 - C15.97 10.46 15.97 10.45 15.96 10.43 - C15.95 10.33 15.93 10.23 15.90 10.13 - C15.86 9.96 15.81 9.79 15.75 9.63 - C15.69 9.50 15.63 9.36 15.57 9.23 - C15.48 9.07 15.38 8.91 15.27 8.76 - C15.14 8.57 14.99 8.40 14.83 8.24 - C14.76 8.17 14.69 8.11 14.62 8.04 - C14.47 7.91 14.30 7.78 14.12 7.67 - C14.12 7.67 14.13 7.67 14.13 7.67 - C14.21 7.53 14.29 7.39 14.37 7.25 - C14.45 7.11 14.53 6.98 14.61 6.84 - C14.66 6.74 14.72 6.64 14.78 6.55 - C14.79 6.52 14.80 6.50 14.81 6.48 - C14.83 6.41 14.83 6.33 14.81 6.27 - C14.81 6.25 14.80 6.24 14.80 6.22 - C14.79 6.20 14.78 6.19 14.77 6.17 - C14.74 6.12 14.70 6.08 14.65 6.05 - C14.60 6.02 14.54 6 14.49 6 - C14.47 5.99 14.44 5.99 14.42 6 - C14.40 6 14.38 6 14.36 6.01 - C14.30 6.02 14.23 6.06 14.19 6.11 - C14.17 6.13 14.15 6.15 14.14 6.18 - C14.08 6.28 14.03 6.37 13.97 6.47 - L13.73 6.88 - C13.65 7.02 13.57 7.16 13.49 7.30 - C13.48 7.31 13.47 7.33 13.46 7.34 - C13.45 7.34 13.44 7.33 13.43 7.33 - C12.98 7.16 12.50 7.07 12 7.07 - C11.98 7.07 11.97 7.07 11.95 7.07 - C11.51 7.07 11.07 7.15 10.67 7.29 - C10.63 7.31 10.58 7.32 10.53 7.34 - C10.53 7.33 10.52 7.31 10.51 7.30 - C10.43 7.16 10.35 7.02 10.27 6.88 - C10.19 6.74 10.11 6.61 10.03 6.47 - C9.97 6.37 9.92 6.28 9.86 6.18 - C9.85 6.15 9.83 6.13 9.81 6.11 - C9.77 6.06 9.70 6.03 9.64 6.01 - C9.62 6 9.60 6 9.58 6 - C9.56 5.99 9.53 5.99 9.51 6 - C9.46 6 9.40 6.02 9.35 6.05 - C9.30 6.08 9.26 6.12 9.23 6.17 - C9.22 6.19 9.21 6.20 9.20 6.22 - C9.20 6.24 9.19 6.25 9.19 6.27 - C9.17 6.34 9.17 6.41 9.19 6.48 - C9.20 6.50 9.21 6.52 9.22 6.55 - C9.28 6.65 9.34 6.74 9.39 6.84 - C9.47 6.98 9.55 7.11 9.63 7.25 - C9.71 7.39 9.79 7.53 9.87 7.67 - C9.87 7.67 9.87 7.67 9.88 7.67 - C9.71 7.77 9.56 7.88 9.41 8.01 - C9.32 8.08 9.24 8.16 9.16 8.24 - C9 8.40 8.85 8.57 8.72 8.76 - C8.61 8.91 8.51 9.07 8.43 9.23 - C8.36 9.36 8.30 9.50 8.24 9.63 - C8.18 9.79 8.13 9.96 8.09 10.13 - C8.06 10.23 8.04 10.33 8.03 10.43 - C8.02 10.45 8.02 10.46 8.02 10.48 - C8.01 10.54 8 10.60 8 10.65 - L16 10.65 - C15.99 10.60 15.98 10.54 15.97 10.48 - L15.97 10.48 - Z - " - android:fillColor="#ffffff"/> + android:pathData="M16,16L16,12L20,12L16,16Z" + android:fillColor="#D9D9D9"/> + <path + android:pathData="M12,8L16,8L16,12L12,8Z" + android:fillColor="#D9D9D9"/> + <path + android:pathData="M12,16L8,16L8,12L12,16Z" + android:fillColor="#D9D9D9"/> + <path + android:pathData="M13.096,2.0354L21.9646,10.904A1.55,1.55 90,0 1,21.9646 13.096L13.096,21.9646A1.55,1.55 90,0 1,10.904 21.9646L2.0354,13.096A1.55,1.55 0,0 1,2.0354 10.904L10.904,2.0354A1.55,1.55 0,0 1,13.096 2.0354z" + android:strokeWidth="1.5" + android:fillColor="#00000000" + android:strokeColor="#FF00FF"/> </group> - <path - android:pathData=" - M12,20.923 - C10.764,20.923 9.946,20.065 9.131,18.653 - C8.316,17.241 4.291,10.269 3.476,8.857 - C2.66,7.445 2.326,6.309 2.944,5.238 - C3.563,4.167 4.714,3.888 6.344,3.888 - C7.975,3.888 16.025,3.888 17.656,3.888 - C19.286,3.888 20.437,4.167 21.056,5.238 - C21.674,6.309 21.34,7.445 20.524,8.857 - C19.709,10.269 15.684,17.241 14.869,18.653 - C14.054,20.065 13.236,20.923 12,20.923 - H12 - Z - " - android:strokeWidth="2" - android:fillColor="#00000000" - android:strokeColor="#ffffff"/> </vector> - |