Snap for 11444858 from 851310475d8d1248a60729710c4517fa32e25c67 to 24Q2-release (f03ae635) · Commits · e / os / android_frameworks_libs_systemui

iconloaderlib/res/drawable/ic_private_profile_app_badge.xml

+5 −3

Original line number	Diff line number	Diff line
		@@ -19,8 +19,10 @@
		android:viewportWidth="24"
		android:viewportHeight="24"
		android:tint="@color/badge_tint_private">
		<group android:scaleX=".6" android:scaleY=".6" android:pivotX="12" android:pivotY="12">
		<path
		android:pathData="M11.033,14H12.967L12.6,11.85C12.789,11.75 12.933,11.606 13.033,11.417C13.144,11.228 13.2,11.022 13.2,10.8C13.2,10.467 13.083,10.183 12.85,9.95C12.617,9.717 12.333,9.6 12,9.6C11.667,9.6 11.383,9.717 11.15,9.95C10.917,10.183 10.8,10.467 10.8,10.8C10.8,11.022 10.85,11.228 10.95,11.417C11.061,11.606 11.211,11.75 11.4,11.85L11.033,14ZM12,18.4C10.5,18.033 9.256,17.183 8.267,15.85C7.289,14.517 6.8,13.039 6.8,11.417V7.6L12,5.6L17.2,7.6V11.417C17.2,13.039 16.706,14.517 15.717,15.85C14.739,17.183 13.5,18.033 12,18.4ZM12,17.15C13.156,16.794 14.111,16.078 14.867,15C15.622,13.922 16,12.728 16,11.417V8.417L12,6.883L8,8.417V11.417C8,12.728 8.378,13.922 9.133,15C9.889,16.078 10.844,16.794 12,17.15Z"
		android:pathData="M5,3H19C20.1,3 21,3.9 21,5V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V5C3,3.9 3.9,3 5,3ZM13.5,15.501L12.93,12.271C13.57,11.941 14,11.271 14,10.501C14,9.401 13.1,8.501 12,8.501C10.9,8.501 10,9.401 10,10.501C10,11.271 10.43,11.941 11.07,12.271L10.5,15.501H13.5Z"
		android:fillColor="#FFFFFFFF"/>
		</group>
		</vector>

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@

		<color name="badge_tint_instant">@android:color/black</color>
		<color name="badge_tint_work">#1A73E8</color>
		<color name="badge_tint_private">#001A41</color>
		<color name="badge_tint_private">#3C4043</color>
		<color name="badge_tint_clone">#ff3C4043</color>

		<!-- Yellow 600, used for highlighting "important" conversations in settings & notifications -->

+14 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,8 @@ import java.util.function.IntFunction;
		@TargetApi(Build.VERSION_CODES.O)
		public class ClockDrawableWrapper extends AdaptiveIconDrawable implements BitmapInfo.Extender {

		public static boolean sRunningInTest = false;

		private static final String TAG = "ClockDrawableWrapper";

		private static final boolean DISABLE_SECONDS = true;
		@@ -455,6 +457,9 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap

		@Override
		public void run() {
		if (sRunningInTest) {
		Log.d("b/319168409", "running this: " + this);
		}
		if (mAnimInfo.applyTime(mTime, mFG)) {
		invalidateSelf();
		} else {
		@@ -468,6 +473,9 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap
		if (visible) {
		reschedule();
		} else {
		if (sRunningInTest) {
		Log.d("b/319168409", "unScheduling self invisible this: " + this);
		}
		unscheduleSelf(this);
		}
		return result;
		@@ -477,10 +485,15 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap
		if (!isVisible()) {
		return;
		}

		if (sRunningInTest) {
		Log.d("b/319168409", "unScheduling self this: " + this);
		}
		unscheduleSelf(this);
		final long upTime = SystemClock.uptimeMillis();
		final long step = TICK_MS; /* tick every 200 ms */
		if (sRunningInTest) {
		Log.d("b/319168409", "scheduling self this: " + this, new Throwable());
		}
		scheduleSelf(this, upTime - ((upTime % step)) + step);
		}