diff options
| author | ztenghui <ztenghui@google.com> | 2014-09-11 16:32:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-11 16:32:37 +0000 |
| commit | c96e3927657558f0d01626c252cf480624749120 (patch) | |
| tree | 130a2265ea5cc41f802e54d02a641af3ed2b2bdf /api | |
| parent | ca517b97e06dc76c07c031a6ee6e3aabd530495f (diff) | |
| parent | 2e17d2b232e11b3ec246c704d8c4707c8fd863fa (diff) | |
| download | frameworks_base-c96e3927657558f0d01626c252cf480624749120.zip frameworks_base-c96e3927657558f0d01626c252cf480624749120.tar.gz frameworks_base-c96e3927657558f0d01626c252cf480624749120.tar.bz2 | |
Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev
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 bb8bc16..4dbe887 100644 --- a/api/current.txt +++ b/api/current.txt @@ -588,6 +588,7 @@ package android { field public static final int fastScrollThumbDrawable = 16843574; // 0x1010336 field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339 field public static final int fillAfter = 16843197; // 0x10101bd + field public static final int fillAlpha = 16843981; // 0x10104cd field public static final int fillBefore = 16843196; // 0x10101bc field public static final int fillColor = 16843806; // 0x101041e field public static final int fillEnabled = 16843343; // 0x101024f @@ -1203,6 +1204,7 @@ package android { field public static final int streamType = 16843273; // 0x1010209 field public static final int stretchColumns = 16843081; // 0x1010149 field public static final int stretchMode = 16843030; // 0x1010116 + field public static final int strokeAlpha = 16843980; // 0x10104cc field public static final int strokeColor = 16843808; // 0x1010420 field public static final int strokeLineCap = 16843813; // 0x1010425 field public static final int strokeLineJoin = 16843814; // 0x1010426 |