diff options
| author | James Dong <jdong@google.com> | 2011-10-27 14:09:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-27 14:09:50 -0700 |
| commit | 17a5fb36f88d90e30fd656d0d93b540ec2e2b84a (patch) | |
| tree | 17332e1b7cad542fa1d3ffede9d9b274338f2b4a /api | |
| parent | 44c990927c362b26b51c4388f8c51e8c799f9932 (diff) | |
| parent | 33fe290ca33235d7e0988cace14de3319a9a83f1 (diff) | |
| download | frameworks_base-17a5fb36f88d90e30fd656d0d93b540ec2e2b84a.zip frameworks_base-17a5fb36f88d90e30fd656d0d93b540ec2e2b84a.tar.gz frameworks_base-17a5fb36f88d90e30fd656d0d93b540ec2e2b84a.tar.bz2 | |
Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ec6a4c8..c94d485 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10537,6 +10537,7 @@ package android.media { field public static final int QUALITY_HIGH = 1; // 0x1 field public static final int QUALITY_LOW = 0; // 0x0 field public static final int QUALITY_QCIF = 2; // 0x2 + field public static final int QUALITY_QVGA = 7; // 0x7 field public static final int QUALITY_TIME_LAPSE_1080P = 1006; // 0x3ee field public static final int QUALITY_TIME_LAPSE_480P = 1004; // 0x3ec field public static final int QUALITY_TIME_LAPSE_720P = 1005; // 0x3ed @@ -10544,6 +10545,7 @@ package android.media { field public static final int QUALITY_TIME_LAPSE_HIGH = 1001; // 0x3e9 field public static final int QUALITY_TIME_LAPSE_LOW = 1000; // 0x3e8 field public static final int QUALITY_TIME_LAPSE_QCIF = 1002; // 0x3ea + field public static final int QUALITY_TIME_LAPSE_QVGA = 1007; // 0x3ef field public int audioBitRate; field public int audioChannels; field public int audioCodec; |