Snap for 12991197 from 5e40b2fe465cae542a58173bfec24cbd95e85b41 to 25Q2-release (8226dce5) · Commits · e / os / android_frameworks_libs_systemui

aconfig/systemui.aconfig

+7 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ flag {
		bug: "242791070"
		}


		flag {
		name: "status_bar_connected_displays"
		namespace: "lse_desktop_experience"
		@@ -122,3 +121,10 @@ flag {
		description: "Add reactive variant fonts to some clocks"
		bug: "343495953"
		}

		flag {
		name: "extended_wallpaper_effects"
		namespace: "systemui"
		description: "Enables extended wallpaper effects"
		bug: "334125919"
		}

ambientlib/Android.bp

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2025 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.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package {
		default_applicable_licenses: ["Android-Apache-2.0"],
		}

		android_library {
		name: "ambientlib",
		manifest: "AndroidManifest.xml",
		sdk_version: "current",
		// TODO(b/391934208): Update min_sdk_version to 35
		min_sdk_version: "31",
		srcs: [
		"src/*/.kt",
		],
		static_libs: [
		"androidx.core_core-ktx",
		"androidx.annotation_annotation",
		"androidx.appsearch_appsearch",
		"androidx.appsearch_appsearch-builtin-types",
		"androidx.appsearch_appsearch-platform-storage",
		"androidx.concurrent_concurrent-futures-ktx",
		"guava",
		"kotlin-stdlib",
		"kotlinx_coroutines",
		"kotlinx-coroutines-android",
		"kotlinx-coroutines-core",
		"kotlinx_coroutines_guava",
		],
		kotlincflags: ["-Xjvm-default=all"],
		}

ambientlib/AndroidManifest.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2025 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.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.google.android.ambient.app">
		</manifest>
		No newline at end of file

ambientlib/build.gradle.kts

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		plugins {
		id(libs.plugins.android.library.get().pluginId)
		id(libs.plugins.kotlin.android.get().pluginId)
		id(libs.plugins.kotlin.kapt.get().pluginId)
		}

		android {
		namespace = "com.google.android.ambient.app"
		sourceSets {
		named("main") {
		java.setSrcDirs(listOf("src"))
		manifest.srcFile("AndroidManifest.xml")
		}
		}
		}

		dependencies {
		implementation("androidx.core:core")
		implementation("androidx.core:core-ktx:1.12.0")
		implementation("com.google.guava:guava:30.1.1-jre")
		implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.7.3")
		implementation(libs.androidx.appsearch)
		implementation(libs.androidx.appsearch.platform.storage)
		implementation(libs.androidx.appsearch.builtin.types)
		kapt("androidx.appsearch:appsearch-compiler:1.1.0-beta01")
		}

ambientlib/src/com/google/android/ambient/app/AmbientData.kt

0 → 100644

+127 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 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.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.google.android.ambient.app

		import android.content.Intent
		import java.time.Instant

		/**
		* A high level, abstracted definition of an [AmbientData] which always contains [MetaData] included
		* for ranking.
		*/
		sealed interface AmbientData {

		/** Ranking [MetaData] associated with this [AmbientData]. */
		val metaData: MetaData

		/** A notification id value that can be utilized to dedupe against. */
		val notificationDedupeId: String

		/** An intrinsic weight definition derived from the type of content, see [Ranker]. */
		val intrinsicWeight: Int

		/**
		* Tap action.
		*
		* <p>{@link Intent#parseUri()} intent.
		*
		* @see <a href="//reference/android/content/Intent#intent-structure">Intent Structure</a>
		*/
		val tapAction: Intent?

		/**
		* Dismiss action.
		*
		* <p>{@link Intent#parseUri()} intent.
		*
		* @see <a href="//reference/android/content/Intent#intent-structure">Intent Structure</a>
		*/
		val dismissAction: Intent?
		}

		/**
		* Ranking metadata with some basic defaults, reference the ambient ranking meta data document for
		* more insight.
		*/
		data class MetaData(
		/**
		* An unique identifier for the [AmbientData], keep this stable if you want to update an
		* existing record rather than creating a new one.
		*/
		val id: String,

		/**
		* Field to uniquely identify the message corresponding to an instance of [AmbientData]
		* document.
		*
		* [instanceId] identify a message used to update the [AmbientDataDocument] document. The
		* [instanceId] is different from the [id] of the [AmbientDataDocument]. The [id] is a unique
		* identifier for the event it represents. and it remains stable when the document is
		* overwritten everytime new data is published. But the [instanceId] uniquely identifies a
		* message and changes when the document is overwritten with the data in the new message.
		*
		* When logging interactions, consumers of this data document must make sure to read the value
		* of this field and set it to the [mQuery] field of [TakenAction] documents.
		*/
		val instanceId: String? = null,

		/**
		* The source package that published the [AmbientData].
		*
		* Will only be populated when read from the read session.
		*/
		val attribution: String? = null,

		/**
		* The created time of the [AmbientData], which if it hasn't been set, defaults to
		* [Instant.MAX].
		*/
		val createAtInstant: Instant = Instant.MAX,

		/**
		* The ttl time of the [AmbientData], which if it hasn't been set, defaults to [Long.MAX_VALUE].
		*/
		val ttlMillis: Long = Long.MAX_VALUE,

		/**
		* The start time of the [AmbientData], which if it hasn't been set, defaults to [Instant.MAX].
		*/
		val startTime: Instant = Instant.MAX,

		/**
		* The end time of the [AmbientData], which if it hasn't been set, defaults to [Instant.MAX].
		*/
		val endTime: Instant = Instant.MAX,

		/**
		* The confidence score of the [AmbientData], which is utilized to break ties in ranking or sort
		* results. Defaults to 1.0 (max confidence).
		*/
		val confidence: Double = 1.0,

		/**
		* A list of [ImportantTimeDuration]'s, that must fall between the [startTime] and the [endTime]
		* that provide extra signals to create a curve for the ranking methodology.
		*/
		val importantTimes: List<ImportantTimeDuration> = listOf(),
		) {

		/**
		* An [ImportantTimeDuration] is a range of time within the [MetaData.startTime] and
		* [MetaData.endTime] that signals the highest priority points across the generated curve.
		*/
		data class ImportantTimeDuration(val startTime: Instant, val endTime: Instant)
		}