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

Commit 5e6e977c authored by Dan Morrill's avatar Dan Morrill Committed by Android (Google) Code Review
Browse files

Merge "Adding features for new hardware, and creating a baseline list of... 

Merge "Adding features for new hardware, and creating a baseline list of required hardware for the Tablet profile. This is very much subject to change."
parents 25962adc 16750623

api/current.xml

+22 −0
Original line number Diff line number Diff line
@@ -55586,6 +55586,17 @@ 
 visibility="public"

>

</field>

<field name="FEATURE_SENSOR_BAROMETER"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.sensor.barometer&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_SENSOR_COMPASS"

 type="java.lang.String"

 transient="false"
@@ -55597,6 +55608,17 @@ 
 visibility="public"

>

</field>

<field name="FEATURE_SENSOR_GYROSCOPE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.sensor.gyroscope&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_SENSOR_LIGHT"

 type="java.lang.String"

 transient="false"

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

+17 −2
Original line number Diff line number Diff line
@@ -711,6 +711,21 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes an accelerometer.

     */

    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes a barometer (air

     * pressure sensor.)

     */

    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes a magnetometer (compass).
@@ -720,10 +735,10 @@ public abstract class PackageManager { 


    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes an accelerometer.

     * {@link #hasSystemFeature}: The device includes a gyroscope.

     */

    @SdkConstant(SdkConstantType.FEATURE)

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

    public static final String FEATURE_SENSOR_GYROSCOPE = "android.hardware.sensor.gyroscope";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

data/etc/android.hardware.sensor.barometer.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

  

          http://www.apache.org/licenses/LICENSE-2.0

  

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Feature for devices with barometer. -->

<permissions>

    <feature name="android.hardware.sensor.barometer" />

</permissions>

data/etc/android.hardware.sensor.gyroscope.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

  

          http://www.apache.org/licenses/LICENSE-2.0

  

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Feature for devices with gyroscope. -->

<permissions>

    <feature name="android.hardware.sensor.gyroscope" />

</permissions>

data/etc/tablet_core_hardware.xml

0 → 100644
+53 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

  

          http://www.apache.org/licenses/LICENSE-2.0

  

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- These are the hardware components that all handheld devices

     must include. Devices with optional hardware must also include extra

     hardware files, per the comments below.



     Handheld devices include phones, mobile Internet devices (MIDs),

     Personal Media Players (PMPs), small tablets (7" or less), and similar

     devices.

-->

<permissions>

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

    <feature name="android.hardware.location.network" />

    <feature name="android.hardware.sensor.compass" />

    <feature name="android.hardware.sensor.accelerometer" />

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

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

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

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

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

    <!-- 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 

         android.hardware.camera.autofocus.xml or 

         android.hardware.camera.autofocus-flash.xml -->

    <!-- devices with a front facing camera must include

         android.hardware.camera.front.xml -->

    <!-- devices with WiFi must also include android.hardware.wifi.xml -->

    <!-- devices with an ambient light sensor must also include

         android.hardware.sensor.light.xml -->

    <!-- devices with a proximity sensor must also include

         android.hardware.sensor.proximity.xml -->

    <!-- devices with a barometer must also include

         android.hardware.sensor.barometer.xml -->

    <!-- devices with a gyroscope must also include

         android.hardware.sensor.gyroscope.xml -->

    <!-- GSM phones must also include android.hardware.telephony.gsm.xml -->

    <!-- CDMA phones must also include android.hardware.telephony.cdma.xml -->

</permissions>