Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I7d40ad9a into eclair

Browse Source 
* changes:
  More on issue #2271640: Fix wallpaper etc docs
This commit is contained in:
Android (Google) Code Review
2009-11-19 18:01:30 -08:00
parent 23aa34a743 08ee42ce86
commit 524812fbf5
2 changed files with 172 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
api/current.xml
View File

@@ -41992,6 +41992,116 @@
visibility="public"
>
</field>
<field name="FEATURE_CAMERA"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.camera&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_CAMERA_AUTOFOCUS"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.camera.autofocus&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_CAMERA_FLASH"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.camera.flash&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_LIVE_WALLPAPER"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.software.live_wallpaper&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_SENSOR_LIGHT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.sensor.light&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_SENSOR_PROXIMITY"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.sensor.proximity&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_TELEPHONY"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.telephony&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_TELEPHONY_CDMA"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.telephony.cdma&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_TELEPHONY_GSM"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.telephony.gsm&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="FEATURE_TOUCHSCREEN_MULTITOUCH"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.hardware.touchscreen.multitouch&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="GET_ACTIVITIES"
type="int"
transient="false"

62
core/java/android/content/pm/PackageManager.java
View File

@@ -513,6 +513,68 @@ public abstract class PackageManager {
*/
public static final int DONT_DELETE_DATA = 0x00000001;
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device has a camera facing away
* from the screen.
*/
public static final String FEATURE_CAMERA = "android.hardware.camera";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device's camera supports auto-focus.
*/
public static final String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device's camera supports flash.
*/
public static final String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device includes a light sensor.
*/
public static final String FEATURE_SENSOR_LIGHT = "android.hardware.sensor.light";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device includes a proximity sensor.
*/
public static final String FEATURE_SENSOR_PROXIMITY = "android.hardware.sensor.proximity";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device has a telephony radio with data
* communication support.
*/
public static final String FEATURE_TELEPHONY = "android.hardware.telephony";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device has a CDMA telephony stack.
*/
public static final String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device has a GSM telephony stack.
*/
public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device's touch screen supports multitouch.
*/
public static final String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device supports live wallpapers.
*/
public static final String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";
/**
* Retrieve overall information about an application package that is
* installed on the system.