Snap for 12802400 from 8ef2af4bc77a44bb9634db9eb0f871b231bfed72 to 25Q2-release (47ac70eb) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -19315,6 +19315,7 @@ package android.webkit {
		method @Deprecated public abstract void setUseWebViewBackgroundForOverscrollBackground(boolean);
		method @Deprecated public abstract void setUserAgent(int);
		method public abstract void setVideoOverlayForEmbeddedEncryptedVideoEnabled(boolean);
		field @FlaggedApi("android.webkit.enable_chips") public static final long ENABLE_CHIPS = 380890146L; // 0x16b3ec22L
		field public static final long ENABLE_SIMPLIFIED_DARK_MODE = 214741472L; // 0xcccb1e0L
		field @FlaggedApi("android.webkit.user_agent_reduction") public static final long ENABLE_USER_AGENT_REDUCTION = 371034303L; // 0x161d88bfL
		}

core/java/android/view/accessibility/flags/accessibility_flags.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -232,6 +232,16 @@ flag {
		}
		}

		flag {
		name: "restore_a11y_secure_settings_on_hsum_device"
		namespace: "accessibility"
		description: "Grab the a11y settings and send the settings restored broadcast for current visible foreground user"
		bug: "381294327"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "supplemental_description"
		namespace: "accessibility"

core/java/android/webkit/WebSettings.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -1788,4 +1788,17 @@ public abstract class WebSettings {
		* @see #setDisabledActionModeMenuItems
		*/
		public static final int MENU_ITEM_PROCESS_TEXT = 1 << 2;

		/**
		* Enable CHIPS for webview.
		* This provides a means to check if partitioned cookies are enabled by default.
		* CHIPS will only be enabled by default for apps targeting Android B or above.
		*
		* @hide
		*/
		@ChangeId
		@EnabledAfter(targetSdkVersion = android.os.Build.VERSION_CODES.VANILLA_ICE_CREAM)
		@FlaggedApi(android.webkit.Flags.FLAG_ENABLE_CHIPS)
		@SystemApi
		public static final long ENABLE_CHIPS = 380890146L;
		}

core/java/android/webkit/flags.aconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,14 @@ flag {
		bug: "371034303"
		}

		flag {
		name: "enable_chips"
		is_exported: true
		namespace: "webview"
		description: "New feature enable CHIPS for webview"
		bug: "359448044"
		}

		flag {
		name: "file_system_access"
		is_exported: true

core/java/com/android/internal/widget/NotificationProgressDrawable.java

+6 −12

Original line number	Diff line number	Diff line
		@@ -147,11 +147,6 @@ public final class NotificationProgressDrawable extends Drawable {
		final Part prevPart = iPart == 0 ? null : mParts.get(iPart - 1);
		final Part nextPart = iPart + 1 == numParts ? null : mParts.get(iPart + 1);
		if (part instanceof Segment segment) {
		// Update the segment-point gap to 2X upon seeing the first faded segment.
		// (Assuming that all segments before are solid, and all segments after are faded.)
		if (segment.mFaded) {
		segPointGap = mState.mSegPointGap * 2;
		}
		final float segWidth = segment.mFraction * totalWidth;
		// Advance the start position to account for a point immediately prior.
		final float startOffset = getSegStartOffset(prevPart, pointRadius, segPointGap, x);
		@@ -225,7 +220,7 @@ public final class NotificationProgressDrawable extends Drawable {
		if (nextPart instanceof Segment nextSeg) {
		if (!seg.mFaded && nextSeg.mFaded) {
		// @see Segment#mFaded
		return hasTrackerIcon ? 0F : segSegGap * 4F;
		return hasTrackerIcon ? 0F : segSegGap;
		}
		return segSegGap;
		}
		@@ -487,11 +482,10 @@ public final class NotificationProgressDrawable extends Drawable {
		* <p>
		* <pre>
		* When mFaded is set to true, a combination of the following is done to the segment:
		* 1. The drawing color is mColor with opacity updated to 15%.
		* 2. The segment-point gap is 2X the segment-point gap for non-faded segments.
		* 3. The gap between faded and non-faded segments is:
		* 4X the segment-segment gap, when there is no tracker icon
		* 0, when there is tracker icon
		* 1. The drawing color is mColor with opacity updated to 40%.
		* 2. The gap between faded and non-faded segments is:
		* - the segment-segment gap, when there is no tracker icon
		* - 0, when there is tracker icon
		* </pre>
		* </p>
		*/
		@@ -764,7 +758,7 @@ public final class NotificationProgressDrawable extends Drawable {
		@ColorInt
		static int getFadedColor(@ColorInt int color) {
		return Color.argb(
		(int) (Color.alpha(color) * 0.25f + 0.5f),
		(int) (Color.alpha(color) * 0.4f + 0.5f),
		Color.red(color),
		Color.green(color),
		Color.blue(color));