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

Commit 59138c00 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add intent to browse recording schedules"

parents e19a36ec e0712b26

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -23836,6 +23836,7 @@ package android.media.tv { 
    field public static final java.lang.String ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED";

    field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS";

    field public static final java.lang.String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS";

    field public static final java.lang.String ACTION_VIEW_RECORDING_SCHEDULES = "android.media.tv.action.VIEW_RECORDING_SCHEDULES";

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

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

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25635,6 +25635,7 @@ package android.media.tv { 
    field public static final java.lang.String ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED";

    field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS";

    field public static final java.lang.String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS";

    field public static final java.lang.String ACTION_VIEW_RECORDING_SCHEDULES = "android.media.tv.action.VIEW_RECORDING_SCHEDULES";

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

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

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -23926,6 +23926,7 @@ package android.media.tv { 
    field public static final java.lang.String ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED";

    field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS";

    field public static final java.lang.String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS";

    field public static final java.lang.String ACTION_VIEW_RECORDING_SCHEDULES = "android.media.tv.action.VIEW_RECORDING_SCHEDULES";

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

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

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

media/java/android/media/tv/TvInputManager.java

+7 −0
Original line number Diff line number Diff line
@@ -317,6 +317,13 @@ public final class TvInputManager { 
     */

    public static final String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS";



    /**

     * Activity action to display the recording schedules. When invoked, the system will display an

     * appropriate UI to browse the schedules.

     */

    public static final String ACTION_VIEW_RECORDING_SCHEDULES =

            "android.media.tv.action.VIEW_RECORDING_SCHEDULES";



    private final ITvInputManager mService;



    private final Object mLock = new Object();