Merge changes from topic "themeservice-init" into main (b0c2b375) · Commits · e / os / android_frameworks_base

core/java/android/app/SystemServiceRegistry.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -863,6 +863,14 @@ public final class SystemServiceRegistry {
		return new SystemVibrator(ctx);
		}});

		registerService(Context.THEME_SERVICE, ThemeManager.class,
		new CachedServiceFetcher<ThemeManager>() {
		@Override
		public ThemeManager createService(ContextImpl ctx) {
		return new ThemeManager();
		}
		});

		registerService(Context.WALLPAPER_SERVICE, WallpaperManager.class,
		new CachedServiceFetcher<WallpaperManager>() {
		@Override

core/java/android/app/ThemeManager.java

0 → 100644

+165 −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 android.app;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemService;
		import android.content.Context;
		import android.content.theming.IThemeManager;
		import android.content.theming.IThemeSettingsCallback;
		import android.content.theming.ThemeSettings;
		import android.os.RemoteException;
		import android.os.ServiceManager;


		/**
		* Provides access to the system Theme Service.
		*
		* <p>This class allows applications to interact with the system's Theme Service, enabling them to
		* register for theme settings change notifications, update theme settings, and retrieve the
		* current theme settings.
		*
		* <p>Theme Settings are managed on a per-user basis. This means that all operations performed
		* through this class are scoped to the user associated with the context from which this
		* {@link ThemeManager} instance was obtained.
		*
		* <p>To obtain an instance of this class, use {@link Context#getSystemService(Class)} with
		* {@link ThemeManager}.
		*
		* @hide
		*/
		@SystemService(Context.THEME_SERVICE)
		@FlaggedApi(android.server.Flags.FLAG_ENABLE_THEME_SERVICE)
		public class ThemeManager {
		private final IThemeManager mService;

		/**
		* @hide
		*/
		public ThemeManager() {
		try {
		mService = IThemeManager.Stub.asInterface(
		ServiceManager.getServiceOrThrow(Context.THEME_SERVICE));
		} catch (ServiceManager.ServiceNotFoundException e) {
		throw new RuntimeException(e);
		}
		}

		/**
		* Registers a callback to receive notifications of theme settings changes.
		*
		* <p>This method allows clients to register an {@link IThemeSettingsCallback}
		* to be notified whenever the theme settings for the current user are changed.
		*
		* @param callback The {@link IThemeSettingsCallback} to register.
		* @return {@code true} if the callback was successfully registered, {@code false} otherwise.
		* @hide
		*/
		public boolean registerThemeSettingsCallback(@NonNull IThemeSettingsCallback callback) {
		try {
		return mService.registerThemeSettingsCallback(callback);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Unregisters a previously registered theme settings change callback.
		*
		* <p>This method allows clients to unregister an {@link IThemeSettingsCallback}
		* that was previously registered using
		* {@link #registerThemeSettingsCallback(IThemeSettingsCallback)}.
		*
		* @param callback The {@link IThemeSettingsCallback} to unregister.
		* @return {@code true} if the callback was successfully unregistered, {@code false} otherwise.
		*/
		public boolean unregisterThemeSettingsCallback(@NonNull IThemeSettingsCallback callback) {
		try {
		return mService.unregisterThemeSettingsCallback(callback);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Updates the theme settings for the current user.
		*
		* <p>This method allows clients to update the theme settings for the current user.
		* The provided {@link ThemeSettings} object should contain the new theme settings.
		* Any settings not explicitly set in the {@link ThemeSettings} object will remain unchanged.
		* Specifically, any null properties within the provided {@link ThemeSettings} object
		* will be skipped, and the corresponding existing theme settings will be preserved.
		*
		* <p>It is recommended to use the {@link android.content.theming.ThemeSettings} to
		* construct
		* {@link ThemeSettings} objects, especially when only updating a subset of theme properties.
		* This ensures that only the intended properties are modified, and avoids accidentally
		* resetting other settings to default or null values.
		*
		* @param newSettings The {@link ThemeSettings} object containing the new theme settings.
		* @hide
		*/
		@RequiresPermission(android.Manifest.permission.UPDATE_THEME_SETTINGS)
		public boolean updateThemeSettings(@NonNull ThemeSettings newSettings) {
		try {
		return mService.updateThemeSettings(newSettings);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Retrieves the theme settings for the current user.
		*
		* <p>This method allows clients to retrieve the current theme settings the calling user.
		*
		* @return The {@link ThemeSettings} object containing the current theme settings,
		* or {@code null} if an error occurs or no settings are found.
		* @hide
		*/
		@Nullable
		public ThemeSettings getThemeSettings() {
		try {
		return mService.getThemeSettings();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Retrieves the theme settings for the current user, or the system default if none is set.
		*
		* <p>This method allows clients to retrieve the current theme settings for the calling user.
		* If no theme has been explicitly set, it returns a system-generated default. This method
		* will never return {@code null}.
		*
		* @return The non-null {@link ThemeSettings} object containing the current or default theme
		* settings.
		* @hide
		*/
		@NonNull
		public ThemeSettings getThemeSettingsOrDefault() {
		try {
		return mService.getThemeSettingsOrDefault();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}
		}

core/java/android/content/Context.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -4402,6 +4402,7 @@ public abstract class Context {
		// @hide: POWER_WHITELIST_MANAGER,
		DEVICE_POLICY_SERVICE,
		UI_MODE_SERVICE,
		// @hide: THEME_SERVICE,
		DOWNLOAD_SERVICE,
		NFC_SERVICE,
		BLUETOOTH_SERVICE,
		@@ -6399,6 +6400,18 @@ public abstract class Context {
		*/
		public static final String OVERLAY_SERVICE = "overlay";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a {@link ThemeManager} for theme
		* management.
		*
		* @see #getSystemService(String)
		* @see ThemeManager
		* @hide
		*/
		@FlaggedApi(android.server.Flags.FLAG_ENABLE_THEME_SERVICE)
		public static final String THEME_SERVICE = "theme";


		/**
		* Use with {@link #getSystemService(String)} to manage resources.
		*

core/java/android/content/om/FabricatedOverlay.java

+47 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.os.FabricatedOverlayInternal;
		import android.os.FabricatedOverlayInternalEntry;
		import android.os.ParcelFileDescriptor;
		import android.text.TextUtils;
		import android.util.ArraySet;
		import android.util.TypedValue;

		import com.android.internal.content.om.OverlayManagerImpl;
		@@ -34,7 +35,11 @@ import com.android.internal.util.Preconditions;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;
		import java.util.Objects;
		import java.util.Set;
		import java.util.stream.Collectors;

		/**
		* FabricatedOverlay describes the content of Fabricated Runtime Resource Overlay (FRRO) that is
		@@ -339,7 +344,12 @@ public class FabricatedOverlay {
		}

		final FabricatedOverlayInternal mOverlay;
		private FabricatedOverlay(FabricatedOverlayInternal overlay) {

		/**
		* @param overlay The internal parcelable to wrap.
		* @hide
		*/
		public FabricatedOverlay(FabricatedOverlayInternal overlay) {
		mOverlay = overlay;
		}

		@@ -396,6 +406,41 @@ public class FabricatedOverlay {
		return mOverlay.targetOverlayable;
		}


		/**
		* Exposes the internal FabricatedOverlayInternal so other services can use the parcelable
		*
		* @return instance of FabricatedOverlayInternal
		* @hide
		*/
		public FabricatedOverlayInternal getInternal() {
		return mOverlay;
		}

		/**
		* Retrieves a list of overlay entries that match any of the specified resource data types.
		*
		* @param dataTypes A variable number of resource data types to filter by, as defined in
		* {@link TypedValue}.
		* @return A non-null list of {@link FabricatedOverlayInternalEntry} objects that match any of
		* the given types. The list will be empty if no entries match or if no data types
		* are provided.
		* @hide
		*/
		@NonNull
		public List<FabricatedOverlayInternalEntry> getEntries(int... dataTypes) {
		if (mOverlay.entries == null \|\| dataTypes == null \|\| dataTypes.length == 0) {
		return Collections.emptyList();
		}
		final Set<Integer> typeSet = new ArraySet<>();
		for (int type : dataTypes) {
		typeSet.add(type);
		}
		return mOverlay.entries.stream()
		.filter(entry -> typeSet.contains(entry.dataType))
		.collect(Collectors.toList());
		}

		/**
		* Ensure the resource name is in the form [package]:type/entry.
		*

core/java/android/content/theming/IThemeManager.aidl

0 → 100644

+39 −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 android.content.theming;

		import android.content.theming.ThemeSettings;
		import android.content.theming.IThemeSettingsCallback;

		/** {@hide} */
		interface IThemeManager {
		/** {@hide} */
		boolean registerThemeSettingsCallback(in IThemeSettingsCallback callback);
		/** {@hide} */
		boolean unregisterThemeSettingsCallback(in IThemeSettingsCallback callback);

		/** {@hide} */
		@EnforcePermission("UPDATE_THEME_SETTINGS")
		@JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.UPDATE_THEME_SETTINGS)")
		boolean updateThemeSettings(in ThemeSettings newSettings);

		/** {@hide} */
		ThemeSettings getThemeSettings();

		/** {@hide} */
		ThemeSettings getThemeSettingsOrDefault();
		}
		No newline at end of file