Mark ColorUserStyleSetting as requiring API 34
Test: N/A
Bug: 367683475
Relnote: ColorUserStyleSetting and ColorOption require API 34 for use.
Change-Id: I8771d0012b5e64971ba21018c9ed3df6ddad517e
diff --git a/wear/watchface/watchface-style/api/current.txt b/wear/watchface/watchface-style/api/current.txt
index 81eb387..032937b 100644
--- a/wear/watchface/watchface-style/api/current.txt
+++ b/wear/watchface/watchface-style/api/current.txt
@@ -138,7 +138,7 @@
method public androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.Builder setWatchFaceEditorData(androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData watchFaceEditorData);
}
- public static final class UserStyleSetting.ColorUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ @RequiresApi(34) public static final class UserStyleSetting.ColorUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
}
public static final class UserStyleSetting.ColorUserStyleSetting.Builder {
@@ -149,7 +149,7 @@
method public androidx.wear.watchface.style.UserStyleSetting.ColorUserStyleSetting.Builder setWatchFaceEditorData(androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData watchFaceEditorData);
}
- public static final class UserStyleSetting.ColorUserStyleSetting.ColorOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ @RequiresApi(34) public static final class UserStyleSetting.ColorUserStyleSetting.ColorOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
method public java.util.List<java.lang.Integer> getColors();
method public CharSequence getDisplayName();
method public CharSequence getScreenReaderName();
diff --git a/wear/watchface/watchface-style/api/restricted_current.txt b/wear/watchface/watchface-style/api/restricted_current.txt
index 81eb387..032937b 100644
--- a/wear/watchface/watchface-style/api/restricted_current.txt
+++ b/wear/watchface/watchface-style/api/restricted_current.txt
@@ -138,7 +138,7 @@
method public androidx.wear.watchface.style.UserStyleSetting.BooleanUserStyleSetting.Builder setWatchFaceEditorData(androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData watchFaceEditorData);
}
- public static final class UserStyleSetting.ColorUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
+ @RequiresApi(34) public static final class UserStyleSetting.ColorUserStyleSetting extends androidx.wear.watchface.style.UserStyleSetting {
}
public static final class UserStyleSetting.ColorUserStyleSetting.Builder {
@@ -149,7 +149,7 @@
method public androidx.wear.watchface.style.UserStyleSetting.ColorUserStyleSetting.Builder setWatchFaceEditorData(androidx.wear.watchface.style.UserStyleSetting.WatchFaceEditorData watchFaceEditorData);
}
- public static final class UserStyleSetting.ColorUserStyleSetting.ColorOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
+ @RequiresApi(34) public static final class UserStyleSetting.ColorUserStyleSetting.ColorOption extends androidx.wear.watchface.style.UserStyleSetting.Option {
method public java.util.List<java.lang.Integer> getColors();
method public CharSequence getDisplayName();
method public CharSequence getScreenReaderName();
diff --git a/wear/watchface/watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleSetting.kt b/wear/watchface/watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleSetting.kt
index 6318e13..914dc5b 100644
--- a/wear/watchface/watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleSetting.kt
+++ b/wear/watchface/watchface-style/src/main/java/androidx/wear/watchface/style/UserStyleSetting.kt
@@ -1039,6 +1039,7 @@
* A ColorUserStyleSetting allows the user to select colour(s) from a list of predefined
* choices.
*/
+ @RequiresApi(34)
public class ColorUserStyleSetting : UserStyleSetting {
/** A Builder for [ColorUserStyleSetting]. */
@@ -1166,6 +1167,7 @@
/**
* Represents choice within a [ColorUserStyleSetting], these must be enumerated up front.
*/
+ @RequiresApi(34)
public class ColorOption : Option {
/** Backing field for [displayName]. */
override val displayNameInternal: DisplayText
diff --git a/wear/watchface/watchface-style/src/test/java/androidx/wear/watchface/style/StyleParcelableTest.kt b/wear/watchface/watchface-style/src/test/java/androidx/wear/watchface/style/StyleParcelableTest.kt
index fc6b011..0e39c2f 100644
--- a/wear/watchface/watchface-style/src/test/java/androidx/wear/watchface/style/StyleParcelableTest.kt
+++ b/wear/watchface/watchface-style/src/test/java/androidx/wear/watchface/style/StyleParcelableTest.kt
@@ -20,7 +20,6 @@
import android.graphics.Color
import android.graphics.RectF
import android.graphics.drawable.Icon
-import android.os.Build
import android.os.Parcel
import androidx.annotation.RequiresApi
import androidx.wear.watchface.complications.ComplicationSlotBounds
@@ -50,7 +49,7 @@
private const val SCREEN_READER_NAME_RESOURCE_ID = 567890
@RunWith(StyleTestRunner::class)
-@RequiresApi(Build.VERSION_CODES.P)
+@RequiresApi(34)
public class StyleParcelableTest {
private val icon1 = Icon.createWithContentUri("icon1")
private val icon2 = Icon.createWithContentUri("icon2")