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

Commit 78614459 authored by Jose Lima's avatar Jose Lima Committed by Android (Google) Code Review
Browse files

Merge "Add pre-order as a pricing type for ContentInfoExtender"

parents c8732612 41120562

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5011,6 +5011,7 @@ package android.app { 
    field public static final java.lang.String CONTENT_MATURITY_LOW = "android.contentMaturity.low";

    field public static final java.lang.String CONTENT_MATURITY_MEDIUM = "android.contentMaturity.medium";

    field public static final java.lang.String CONTENT_PRICING_FREE = "android.contentPrice.free";

    field public static final java.lang.String CONTENT_PRICING_PREORDER = "android.contentPrice.preorder";

    field public static final java.lang.String CONTENT_PRICING_PURCHASE = "android.contentPrice.purchase";

    field public static final java.lang.String CONTENT_PRICING_RENTAL = "android.contentPrice.rental";

    field public static final java.lang.String CONTENT_PRICING_SUBSCRIPTION = "android.contentPrice.subscription";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5102,6 +5102,7 @@ package android.app { 
    field public static final java.lang.String CONTENT_MATURITY_LOW = "android.contentMaturity.low";

    field public static final java.lang.String CONTENT_MATURITY_MEDIUM = "android.contentMaturity.medium";

    field public static final java.lang.String CONTENT_PRICING_FREE = "android.contentPrice.free";

    field public static final java.lang.String CONTENT_PRICING_PREORDER = "android.contentPrice.preorder";

    field public static final java.lang.String CONTENT_PRICING_PURCHASE = "android.contentPrice.purchase";

    field public static final java.lang.String CONTENT_PRICING_RENTAL = "android.contentPrice.rental";

    field public static final java.lang.String CONTENT_PRICING_SUBSCRIPTION = "android.contentPrice.subscription";

core/java/android/app/Notification.java

+7 −0
Original line number Diff line number Diff line
@@ -5646,6 +5646,13 @@ public class Notification implements Parcelable 
         */

        public static final String CONTENT_PRICING_PURCHASE = "android.contentPrice.purchase";



        /**

         * Value to be used with {@link #setPricingInformation} to indicate that the content

         * referred by the notification item is available currently as a pre-order, and the price

         * value provided is the purchase price for the item.

         */

        public static final String CONTENT_PRICING_PREORDER = "android.contentPrice.preorder";



        /**

         * Value to be used with {@link #setPricingInformation} to indicate that the content

         * referred by the notification item is available as part of a subscription based service,