diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-17 18:18:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-17 18:18:27 -0700 |
| commit | abe3927701c0aff839498272565aeee714aa6e9d (patch) | |
| tree | d6b9dffef79d7a626d2b6163628108a19dbfa6c0 /api/16.txt | |
| parent | 665935c10ad281721c495621fab7561f2a28842e (diff) | |
| parent | 0cf2c8a53350a800055e76c1c9bf0a6d44480768 (diff) | |
| download | frameworks_base-abe3927701c0aff839498272565aeee714aa6e9d.zip frameworks_base-abe3927701c0aff839498272565aeee714aa6e9d.tar.gz frameworks_base-abe3927701c0aff839498272565aeee714aa6e9d.tar.bz2 | |
Merge "Fix issue #6515427: Add android.hardware.television and fix..." into jb-dev
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 |