Merge "Don't include private resources in generated R.java" into androidx-main
diff --git a/car/app/app/api/current.txt b/car/app/app/api/current.txt
index 3b658e4..b055ff7 100644
--- a/car/app/app/api/current.txt
+++ b/car/app/app/api/current.txt
@@ -2817,6 +2817,15 @@
}
+package androidx.car.app.theme {
+
+ @androidx.car.app.annotations.RequiresCarApi(9) public final class CarAppTheme {
+ field public static final int APP_THEME = 1; // 0x1
+ field public static final int SYSTEM_THEME = 0; // 0x0
+ }
+
+}
+
package androidx.car.app.validation {
public final class HostValidator {
diff --git a/car/app/app/api/restricted_current.txt b/car/app/app/api/restricted_current.txt
index 3b658e4..b055ff7 100644
--- a/car/app/app/api/restricted_current.txt
+++ b/car/app/app/api/restricted_current.txt
@@ -2817,6 +2817,15 @@
}
+package androidx.car.app.theme {
+
+ @androidx.car.app.annotations.RequiresCarApi(9) public final class CarAppTheme {
+ field public static final int APP_THEME = 1; // 0x1
+ field public static final int SYSTEM_THEME = 0; // 0x0
+ }
+
+}
+
package androidx.car.app.validation {
public final class HostValidator {
diff --git a/car/app/app/src/main/java/androidx/car/app/theme/CarAppTheme.java b/car/app/app/src/main/java/androidx/car/app/theme/CarAppTheme.java
new file mode 100644
index 0000000..33b06cf
--- /dev/null
+++ b/car/app/app/src/main/java/androidx/car/app/theme/CarAppTheme.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2026 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 androidx.car.app.theme;
+
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.RestrictTo;
+import androidx.car.app.annotations.RequiresCarApi;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@RequiresCarApi(9)
+/* Represents the theme style configuration for the car app. */
+public final class CarAppTheme {
+ private CarAppTheme() {} // Non-instantiable
+
+ /** Respect system/OEM customization (colors, shapes, typography). */
+ public static final int SYSTEM_THEME = 0;
+
+ /** Request standard/neutral theme experience, bypassing OEM overrides. */
+ public static final int APP_THEME = 1;
+
+ @IntDef({SYSTEM_THEME, APP_THEME})
+ @Retention(RetentionPolicy.SOURCE)
+ @RestrictTo(LIBRARY)
+ public @interface Theme {}
+}
diff --git a/libraryversions.toml b/libraryversions.toml
index 4906c8d..e58891f 100644
--- a/libraryversions.toml
+++ b/libraryversions.toml
@@ -69,7 +69,7 @@
EMOJI2 = "1.6.0"
ENTERPRISE = "1.1.0-rc01"
EXIFINTERFACE = "1.4.0-rc01"
-FRAGMENT = "1.9.0-alpha01"
+FRAGMENT = "1.9.0-alpha02"
FUTURES = "1.4.0-alpha01"
GLANCE = "1.3.0-alpha02"
GLANCE_WEAR = "1.0.0-alpha13"