Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e4e3bfe authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Add some new predefined output switcher subtexts 

Specifically:
- SUBTEXT_ERROR_UNKNOWN,
- SUBTEXT_DEVICE_LOW_POWER,
- SUBTEXT_UNAUTHORIZED,
- SUBTEXT_TRACK_UNSUPPORTED,

Bug: 266923039
Test: atest MediaRouter2HostTest
Change-Id: Ife8f44396a76823f3fc2d5a10fc403e45d9ff016
parent c614b47a

core/api/current.txt

+7 −3
Original line number Diff line number Diff line
@@ -24658,11 +24658,15 @@ package android.media { 
    field public static final int SELECTION_BEHAVIOR_GO_TO_APP = 2; // 0x2

    field public static final int SELECTION_BEHAVIOR_NONE = 0; // 0x0

    field public static final int SELECTION_BEHAVIOR_TRANSFER = 1; // 0x1

    field public static final int SUBTEXT_AD_ROUTING_DISALLOWED = 3; // 0x3

    field public static final int SUBTEXT_AD_ROUTING_DISALLOWED = 4; // 0x4

    field public static final int SUBTEXT_CUSTOM = 10000; // 0x2710

    field public static final int SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED = 2; // 0x2

    field public static final int SUBTEXT_DEVICE_LOW_POWER = 5; // 0x5

    field public static final int SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED = 3; // 0x3

    field public static final int SUBTEXT_ERROR_UNKNOWN = 1; // 0x1

    field public static final int SUBTEXT_NONE = 0; // 0x0

    field public static final int SUBTEXT_SUBSCRIPTION_REQUIRED = 1; // 0x1

    field public static final int SUBTEXT_SUBSCRIPTION_REQUIRED = 2; // 0x2

    field public static final int SUBTEXT_TRACK_UNSUPPORTED = 7; // 0x7

    field public static final int SUBTEXT_UNAUTHORIZED = 6; // 0x6

  }















  public static final class RouteListingPreference.Item.Builder {

























media/java/android/media/RouteListingPreference.java



+35
−7




























Original line number
Diff line number
Diff line








@@ -300,30 +300,54 @@ public final class RouteListingPreference implements Parcelable {













                prefix = {"SUBTEXT_"},















                value = {















                    SUBTEXT_NONE,













                    SUBTEXT_ERROR_UNKNOWN,















                    SUBTEXT_SUBSCRIPTION_REQUIRED,















                    SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED,















                    SUBTEXT_AD_ROUTING_DISALLOWED,













                    SUBTEXT_DEVICE_LOW_POWER,













                    SUBTEXT_UNAUTHORIZED,













                    SUBTEXT_TRACK_UNSUPPORTED,















                    SUBTEXT_CUSTOM















                })















        public @interface SubText {}































        /** The corresponding route has no associated subtext. */















        public static final int SUBTEXT_NONE = 0;













        /**













         * The corresponding route's subtext must indicate that it is not available because of an













         * unknown error.













         */













        public static final int SUBTEXT_ERROR_UNKNOWN = 1;















        /**















         * The corresponding route's subtext must indicate that it requires a special subscription















         * in order to be available for routing.















         */













        public static final int SUBTEXT_SUBSCRIPTION_REQUIRED = 1;













        public static final int SUBTEXT_SUBSCRIPTION_REQUIRED = 2;















        /**















         * The corresponding route's subtext must indicate that downloaded content cannot be routed















         * to it.















         */













        public static final int SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED = 2;













        public static final int SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED = 3;















        /**















         * The corresponding route's subtext must indicate that it is not available because an ad is















         * in progress.















         */













        public static final int SUBTEXT_AD_ROUTING_DISALLOWED = 3;













        public static final int SUBTEXT_AD_ROUTING_DISALLOWED = 4;













        /**













         * The corresponding route's subtext must indicate that it is not available because the













         * device is in low-power mode.













         */













        public static final int SUBTEXT_DEVICE_LOW_POWER = 5;













        /**













         * The corresponding route's subtext must indicate that it is not available because the user













         * is not authorized to route to it.













         */













        public static final int SUBTEXT_UNAUTHORIZED = 6;













        /**













         * The corresponding route's subtext must indicate that it is not available because the













         * device does not support the current media track.













         */













        public static final int SUBTEXT_TRACK_UNSUPPORTED = 7;















        /**















         * The corresponding route's subtext must be obtained from {@link















         * #getCustomSubtextMessage()}.










@@ -415,10 +439,14 @@ public final class RouteListingPreference implements Parcelable {













         * <p>If this method returns {@link #SUBTEXT_CUSTOM}, then the subtext is obtained form















         * {@link #getCustomSubtextMessage()}.















         *













         * @see #SUBTEXT_NONE













         * @see #SUBTEXT_SUBSCRIPTION_REQUIRED













         * @see #SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED













         * @see #SUBTEXT_AD_ROUTING_DISALLOWED













         * @see #SUBTEXT_NONE,













         * @see #SUBTEXT_ERROR_UNKNOWN,













         * @see #SUBTEXT_SUBSCRIPTION_REQUIRED,













         * @see #SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED,













         * @see #SUBTEXT_AD_ROUTING_DISALLOWED,













         * @see #SUBTEXT_DEVICE_LOW_POWER,













         * @see #SUBTEXT_UNAUTHORIZED ,













         * @see #SUBTEXT_TRACK_UNSUPPORTED,















         * @see #SUBTEXT_CUSTOM















         */















        @SubText