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

Commit 9b18001a authored by Tim Kilbourn's avatar Tim Kilbourn Committed by Android Git Automerger
Browse files

am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into klp-modular-dev 

* commit 'ec033943':
  Add leanback device features.
parents 050b39bd ec033943

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -7645,6 +7645,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";

    field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";

    field public static final java.lang.String FEATURE_INPUT_METHODS = "android.software.input_methods";

    field public static final java.lang.String FEATURE_LEANBACK = "android.software.leanback";

    field public static final java.lang.String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";

    field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location";

    field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps";
@@ -7668,7 +7669,7 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_TELEPHONY = "android.hardware.telephony";

    field public static final java.lang.String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";

    field public static final java.lang.String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";

    field public static final java.lang.String FEATURE_TELEVISION = "android.hardware.type.television";

    field public static final deprecated java.lang.String FEATURE_TELEVISION = "android.hardware.type.television";

    field public static final java.lang.String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";

    field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";

    field public static final java.lang.String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";

core/java/android/content/pm/PackageManager.java

+21 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,26 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_DEVICE_ADMIN = "android.software.device_admin";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports leanback UI. This is

     * typically used in a living room television experience, but is a software

     * feature unlike {@link #FEATURE_TELEVISION}. Devices running with this

     * feature will use resources associated with the "television" UI mode.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_LEANBACK = "android.software.leanback";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports only leanback UI. Only

     * applications designed for this experience should be run, though this is

     * not enforced by the system.

     * @hide

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_LEANBACK_ONLY = "android.software.leanback_only";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports WiFi (802.11) networking.
@@ -1252,6 +1272,7 @@ public abstract class PackageManager { 
     * room television experience: displayed on a big screen, where the user

     * is sitting far away from it, and the dominant form of input will be

     * something like a DPAD, not through touch or mouse.

     * @deprecated use {@link #FEATURE_LEANBACK} instead.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TELEVISION = "android.hardware.type.television";