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

Commit ae262a89 authored by Jae Seo's avatar Jae Seo Committed by Android (Google) Code Review
Browse files

Merge "Enable to set canRecord and tunerCount statically" into nyc-dev

parents 2f17c362 dee3cfe8

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ package android { 
    field public static final int calendarViewStyle = 16843613; // 0x101035d

    field public static final int canControlMagnification = 16844040; // 0x1010508

    field public static final int canPerformGestures = 16844046; // 0x101050e

    field public static final int canRecord = 16844061; // 0x101051d

    field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7
@@ -1359,6 +1360,7 @@ package android { 
    field public static final int trimPathEnd = 16843785; // 0x1010409

    field public static final int trimPathOffset = 16843786; // 0x101040a

    field public static final int trimPathStart = 16843784; // 0x1010408

    field public static final int tunerCount = 16844062; // 0x101051e

    field public static final int type = 16843169; // 0x10101a1

    field public static final int typeface = 16842902; // 0x1010096

    field public static final int uiOptions = 16843672; // 0x1010398

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -433,6 +433,7 @@ package android { 
    field public static final int calendarViewStyle = 16843613; // 0x101035d

    field public static final int canControlMagnification = 16844040; // 0x1010508

    field public static final int canPerformGestures = 16844046; // 0x101050e

    field public static final int canRecord = 16844061; // 0x101051d

    field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7
@@ -1458,6 +1459,7 @@ package android { 
    field public static final int trimPathEnd = 16843785; // 0x1010409

    field public static final int trimPathOffset = 16843786; // 0x101040a

    field public static final int trimPathStart = 16843784; // 0x1010408

    field public static final int tunerCount = 16844062; // 0x101051e

    field public static final int type = 16843169; // 0x10101a1

    field public static final int typeface = 16842902; // 0x1010096

    field public static final int uiOptions = 16843672; // 0x1010398

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ package android { 
    field public static final int calendarViewStyle = 16843613; // 0x101035d

    field public static final int canControlMagnification = 16844040; // 0x1010508

    field public static final int canPerformGestures = 16844046; // 0x101050e

    field public static final int canRecord = 16844061; // 0x101051d

    field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7
@@ -1359,6 +1360,7 @@ package android { 
    field public static final int trimPathEnd = 16843785; // 0x1010409

    field public static final int trimPathOffset = 16843786; // 0x101040a

    field public static final int trimPathStart = 16843784; // 0x1010408

    field public static final int tunerCount = 16844062; // 0x101051e

    field public static final int type = 16843169; // 0x10101a1

    field public static final int typeface = 16842902; // 0x1010096

    field public static final int uiOptions = 16843672; // 0x1010398

core/res/res/values/attrs.xml

+11 −4
Original line number Diff line number Diff line
@@ -8048,12 +8048,19 @@ i 
         {@link android.media.tv.TvInputService#SERVICE_META_DATA} meta-data entry.

         Described here are the attributes that can be included in that tag. -->

    <declare-styleable name="TvInputService">

        <!-- Component name of an activity for setup of this service.

             The setup includes scanning channels and registering EPG data. -->

        <!-- Component name of an activity that allows the user to set up this service. -->

        <attr name="setupActivity" format="string" />

        <!-- Component name of an activity that allows the user to modify

             the settings for this service. -->

        <!-- Component name of an activity that allows the user to modify the settings for this

             service. -->

        <attr name="settingsActivity" />

        <!-- Attribute whether the TV input service can record programs. This value can be changed

             at runtime by calling

             {@link android.media.tv.TvInputService#updateTvInputInfo(android.content.Context, android.media.tv.TvInputInfo)}. -->

        <attr name="canRecord" format="boolean" />

        <!-- The number of tuners that the TV input service is associated with. This value can be

             changed at runtime by calling

             {@link android.media.tv.TvInputService#updateTvInputInfo(android.content.Context, android.media.tv.TvInputInfo)}. -->

        <attr name="tunerCount" format="integer" />

    </declare-styleable>



    <!-- Attributes that can be used with <code>rating-system-definition</code> tags inside of the

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -2703,6 +2703,8 @@ 
    <public type="attr" name="version" />

    <public type="attr" name="backupInForeground" />

    <public type="attr" name="countDown" />

    <public type="attr" name="canRecord" />

    <public type="attr" name="tunerCount" />



    <public type="style" name="Theme.Material.Light.DialogWhenLarge.DarkActionBar" />

    <public type="style" name="Widget.Material.SeekBar.Discrete" />