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

Commit 65efcc55 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 77fc8b80 to master"

parents 6d99a393 711516d1

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -5821,6 +5821,8 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_LOCATION_NETWORK = "android.hardware.location.network";

    field public static final java.lang.String FEATURE_MICROPHONE = "android.hardware.microphone";

    field public static final java.lang.String FEATURE_NFC = "android.hardware.nfc";

    field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";

    field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";

    field public static final java.lang.String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer";

    field public static final java.lang.String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer";

    field public static final java.lang.String FEATURE_SENSOR_COMPASS = "android.hardware.sensor.compass";

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

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

    public static final String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports portrait orientation

     * screens.  For backwards compatibility, you can assume that if neither

     * this nor {@link #FEATURE_SCREEN_LANDSCAPE} is set then the device supports

     * both portrait and landscape.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports landscape orientation

     * screens.  For backwards compatibility, you can assume that if neither

     * this nor {@link #FEATURE_SCREEN_PORTRAIT} is set then the device supports

     * both portrait and landscape.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports live wallpapers.

core/java/android/os/Build.java

+20 −0
Original line number Diff line number Diff line
@@ -253,6 +253,26 @@ public class Build { 
         * later.  Applications that don't support a screen size at least as

         * large as the current screen will provide the user with a UI to

         * switch them in to screen size compatibility mode.</p>

         *

         * <p>This version introduces new screen size resource qualifiers

         * based on the screen size in dp: see

         * {@link android.content.res.Configuration#screenWidthDp},

         * {@link android.content.res.Configuration#screenHeightDp}, and

         * {@link android.content.res.Configuration#smallestScreenWidthDp}.

         * Supplying these in &lt;supports-screens&gt; as per

         * {@link android.content.pm.ApplicationInfo#requiresSmallestWidthDp},

         * {@link android.content.pm.ApplicationInfo#compatibleWidthLimitDp}, and

         * {@link android.content.pm.ApplicationInfo#largestWidthLimitDp} is

         * preferred over the older screen size buckets and for older devices

         * the appropriate buckets will be inferred from them.</p>

         *

         * <p>New {@link android.content.pm.PackageManager#FEATURE_SCREEN_PORTRAIT}

         * and {@link android.content.pm.PackageManager#FEATURE_SCREEN_LANDSCAPE}

         * features are introduced in this release.  Applications that target

         * previous platform versions are assumed to require both portrait and

         * landscape support in the device; when targeting Honeycomb MR1 or

         * greater the application is responsible for specifying any specific

         * orientation it requires.</p>

         */

        public static final int HONEYCOMB_MR2 = 13;

data/etc/handheld_core_hardware.xml

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
    <feature name="android.hardware.bluetooth" />

    <feature name="android.hardware.touchscreen" />

    <feature name="android.hardware.microphone" />

    <feature name="android.hardware.screen.portrait" />

    <feature name="android.hardware.screen.landscape" />

    <!-- devices with GPS must include android.hardware.location.gps.xml -->

    <!-- devices with an autofocus camera and/or flash must include either

         android.hardware.camera.autofocus.xml or

data/etc/tablet_core_hardware.xml

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
    <feature name="android.hardware.touchscreen.multitouch" />

    <feature name="android.hardware.touchscreen.multitouch.distinct" />

    <feature name="android.hardware.microphone" />

    <feature name="android.hardware.screen.portrait" />

    <feature name="android.hardware.screen.landscape" />

    <!-- devices with GPS must include android.hardware.location.gps.xml -->

    <!-- devices with a rear-facing camera must include one of these as appropriate:

         android.hardware.camera.xml or