diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-17 17:29:49 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-05-17 18:11:14 -0700 |
| commit | 0cf2c8a53350a800055e76c1c9bf0a6d44480768 (patch) | |
| tree | 67f2150a49ee93cd141c4fa23ec0526ef0c12ad3 /api/16.txt | |
| parent | 20c0cdbbf79cef18e59514e0f53dfbcac0bef600 (diff) | |
| download | frameworks_base-0cf2c8a53350a800055e76c1c9bf0a6d44480768.zip frameworks_base-0cf2c8a53350a800055e76c1c9bf0a6d44480768.tar.gz frameworks_base-0cf2c8a53350a800055e76c1c9bf0a6d44480768.tar.bz2 | |
Fix issue #6515427: Add android.hardware.television and fix...
...logic for notouch in Configuration
Added new TELEVISION feature.
We now force the configuration to "television" if the TELEVISION
feature is set, and "notouch" if the TOUCHSCREEN feature is not set.
Also cleaned up documentation, deprecated some configurations that
are not used.
Change-Id: If1c7a284b580a8a66bda2a75f0c7fa841b3dc9b7
Diffstat (limited to 'api/16.txt')
| -rw-r--r-- | api/16.txt | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -6519,6 +6519,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 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"; @@ -6794,7 +6795,7 @@ package android.content.res { field public static final int NAVIGATION_WHEEL = 4; // 0x4 field public static final int ORIENTATION_LANDSCAPE = 2; // 0x2 field public static final int ORIENTATION_PORTRAIT = 1; // 0x1 - field public static final int ORIENTATION_SQUARE = 3; // 0x3 + field public static final deprecated int ORIENTATION_SQUARE = 3; // 0x3 field public static final int ORIENTATION_UNDEFINED = 0; // 0x0 field public static final int SCREENLAYOUT_LONG_MASK = 48; // 0x30 field public static final int SCREENLAYOUT_LONG_NO = 16; // 0x10 @@ -6811,7 +6812,7 @@ package android.content.res { field public static final int SMALLEST_SCREEN_WIDTH_DP_UNDEFINED = 0; // 0x0 field public static final int TOUCHSCREEN_FINGER = 3; // 0x3 field public static final int TOUCHSCREEN_NOTOUCH = 1; // 0x1 - field public static final int TOUCHSCREEN_STYLUS = 2; // 0x2 + field public static final deprecated int TOUCHSCREEN_STYLUS = 2; // 0x2 field public static final int TOUCHSCREEN_UNDEFINED = 0; // 0x0 field public static final int UI_MODE_NIGHT_MASK = 48; // 0x30 field public static final int UI_MODE_NIGHT_NO = 16; // 0x10 |