diff options
| author | Alan Viverette <alanv@google.com> | 2013-10-04 10:17:09 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2013-10-04 10:17:09 -0700 |
| commit | 1461e26674d73e9ad7d7896c59c936a2f88af3f4 (patch) | |
| tree | 5e9f3aa80d784864df1f7cf9a5b03cf32eb4b97d /api | |
| parent | a37bbc6afc9700c4b7ff7f8e116f656c608c9ae0 (diff) | |
| parent | 92a827b816e3d17d8e1f29a847a257620e8859dc (diff) | |
| download | frameworks_base-1461e26674d73e9ad7d7896c59c936a2f88af3f4.zip frameworks_base-1461e26674d73e9ad7d7896c59c936a2f88af3f4.tar.gz frameworks_base-1461e26674d73e9ad7d7896c59c936a2f88af3f4.tar.bz2 | |
resolved conflicts for merge of 92a827b8 to master
Change-Id: Ia262f5c80cdaa391db08f766cee62919a8705e80
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 8cfccd2..ccf571d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28404,6 +28404,7 @@ package android.view { field public static final int HAPTIC_FEEDBACK_ENABLED = 268435456; // 0x10000000 field public static final int IMPORTANT_FOR_ACCESSIBILITY_AUTO = 0; // 0x0 field public static final int IMPORTANT_FOR_ACCESSIBILITY_NO = 2; // 0x2 + field public static final int IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS = 4; // 0x4 field public static final int IMPORTANT_FOR_ACCESSIBILITY_YES = 1; // 0x1 field public static final int INVISIBLE = 4; // 0x4 field public static final int KEEP_SCREEN_ON = 67108864; // 0x4000000 |