diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-11 12:41:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-11 12:41:11 -0700 |
| commit | ff5c9146b53d8429f8ee778f193582c12da0d2b3 (patch) | |
| tree | ee647683d158da2250f35c6d69761d84a56e25db /api | |
| parent | c574fd04cc192fa30af5dd065c5d0cd4c50f8db4 (diff) | |
| parent | 7cfd7d5b65b725d7253295becfe02f03767c71fa (diff) | |
| download | frameworks_base-ff5c9146b53d8429f8ee778f193582c12da0d2b3.zip frameworks_base-ff5c9146b53d8429f8ee778f193582c12da0d2b3.tar.gz frameworks_base-ff5c9146b53d8429f8ee778f193582c12da0d2b3.tar.bz2 | |
Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 1e3e2bb..b3af9f9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9865,6 +9865,7 @@ package android.hardware { field public static final java.lang.String SCENE_MODE_BEACH = "beach"; field public static final java.lang.String SCENE_MODE_CANDLELIGHT = "candlelight"; field public static final java.lang.String SCENE_MODE_FIREWORKS = "fireworks"; + field public static final java.lang.String SCENE_MODE_HDR = "hdr"; field public static final java.lang.String SCENE_MODE_LANDSCAPE = "landscape"; field public static final java.lang.String SCENE_MODE_NIGHT = "night"; field public static final java.lang.String SCENE_MODE_NIGHT_PORTRAIT = "night-portrait"; |