summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2014-05-08 17:40:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-08 17:40:09 +0000
commitf563ef81023daf3a4d498100761da8113ad82d9f (patch)
tree6a98a204ac91942348015eb1658ec1602de22078 /api
parent04a4329b782168819a1268280d7370dc7f2268bf (diff)
parentddbbb8ae8561c9e61becd03faa40997d76ab5a51 (diff)
downloadframeworks_base-f563ef81023daf3a4d498100761da8113ad82d9f.zip
frameworks_base-f563ef81023daf3a4d498100761da8113ad82d9f.tar.gz
frameworks_base-f563ef81023daf3a4d498100761da8113ad82d9f.tar.bz2
am 3225a6b5: Further cleaning on animated part of VectorDrawable.
* commit '3225a6b5b09c8ec78071186bfb20289600812c21': Further cleaning on animated part of VectorDrawable.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt106
1 files changed, 50 insertions, 56 deletions
diff --git a/api/current.txt b/api/current.txt
index 1870f86..aef0e3c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -250,7 +250,7 @@ package android {
field public static final int actionBarTabBarStyle = 16843508; // 0x10102f4
field public static final int actionBarTabStyle = 16843507; // 0x10102f3
field public static final int actionBarTabTextStyle = 16843509; // 0x10102f5
- field public static final int actionBarTheme = 16843837; // 0x101043d
+ field public static final int actionBarTheme = 16843831; // 0x1010437
field public static final int actionBarWidgetTheme = 16843671; // 0x1010397
field public static final int actionButtonStyle = 16843480; // 0x10102d8
field public static final int actionDropDownStyle = 16843479; // 0x10102d7
@@ -267,7 +267,7 @@ package android {
field public static final int actionModeSplitBackground = 16843677; // 0x101039d
field public static final int actionModeStyle = 16843668; // 0x1010394
field public static final int actionOverflowButtonStyle = 16843510; // 0x10102f6
- field public static final int actionOverflowMenuStyle = 16843857; // 0x1010451
+ field public static final int actionOverflowMenuStyle = 16843851; // 0x101044b
field public static final int actionProviderClass = 16843657; // 0x1010389
field public static final int actionViewClass = 16843516; // 0x10102fc
field public static final int activatedBackgroundIndicator = 16843517; // 0x10102fd
@@ -295,7 +295,6 @@ package android {
field public static final int alwaysDrawnWithCache = 16842991; // 0x10100ef
field public static final int alwaysRetainTaskState = 16843267; // 0x1010203
field public static final int angle = 16843168; // 0x10101a0
- field public static final int animate = 16843823; // 0x101042f
field public static final int animateFirstView = 16843477; // 0x10102d5
field public static final int animateLayoutChanges = 16843506; // 0x10102f2
field public static final int animateOnClick = 16843356; // 0x101025c
@@ -314,7 +313,7 @@ package android {
field public static final int autoCompleteTextViewStyle = 16842859; // 0x101006b
field public static final int autoLink = 16842928; // 0x10100b0
field public static final int autoMirrored = 16843754; // 0x10103ea
- field public static final int autoRemoveFromRecents = 16843859; // 0x1010453
+ field public static final int autoRemoveFromRecents = 16843853; // 0x101044d
field public static final int autoStart = 16843445; // 0x10102b5
field public static final deprecated int autoText = 16843114; // 0x101016a
field public static final int autoUrlDetect = 16843404; // 0x101028c
@@ -383,29 +382,29 @@ package android {
field public static final int clipChildren = 16842986; // 0x10100ea
field public static final int clipOrientation = 16843274; // 0x101020a
field public static final int clipToPadding = 16842987; // 0x10100eb
- field public static final int clipToPath = 16843822; // 0x101042e
+ field public static final int clipToPath = 16843818; // 0x101042a
field public static final int codes = 16843330; // 0x1010242
field public static final int collapseColumns = 16843083; // 0x101014b
field public static final int color = 16843173; // 0x10101a5
- field public static final int colorAccent = 16843842; // 0x1010442
+ field public static final int colorAccent = 16843836; // 0x101043c
field public static final int colorActivatedHighlight = 16843664; // 0x1010390
field public static final int colorBackground = 16842801; // 0x1010031
field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab
- field public static final int colorButtonNormal = 16843829; // 0x1010435
- field public static final int colorButtonNormalColored = 16843831; // 0x1010437
- field public static final int colorButtonPressed = 16843830; // 0x1010436
- field public static final int colorButtonPressedColored = 16843832; // 0x1010438
- field public static final int colorControlActivated = 16843828; // 0x1010434
- field public static final int colorControlNormal = 16843827; // 0x1010433
+ field public static final int colorButtonNormal = 16843823; // 0x101042f
+ field public static final int colorButtonNormalColored = 16843825; // 0x1010431
+ field public static final int colorButtonPressed = 16843824; // 0x1010430
+ field public static final int colorButtonPressedColored = 16843826; // 0x1010432
+ field public static final int colorControlActivated = 16843822; // 0x101042e
+ field public static final int colorControlNormal = 16843821; // 0x101042d
field public static final int colorFocusedHighlight = 16843663; // 0x101038f
field public static final int colorForeground = 16842800; // 0x1010030
field public static final int colorForegroundInverse = 16843270; // 0x1010206
field public static final int colorLongPressedHighlight = 16843662; // 0x101038e
field public static final int colorMultiSelectHighlight = 16843665; // 0x1010391
field public static final int colorPressedHighlight = 16843661; // 0x101038d
- field public static final int colorPrimary = 16843840; // 0x1010440
- field public static final int colorPrimaryDark = 16843841; // 0x1010441
- field public static final int colorPrimaryLight = 16843839; // 0x101043f
+ field public static final int colorPrimary = 16843834; // 0x101043a
+ field public static final int colorPrimaryDark = 16843835; // 0x101043b
+ field public static final int colorPrimaryLight = 16843833; // 0x1010439
field public static final int columnCount = 16843639; // 0x1010377
field public static final int columnDelay = 16843215; // 0x10101cf
field public static final int columnOrderPreserved = 16843640; // 0x1010378
@@ -464,7 +463,7 @@ package android {
field public static final int dividerHorizontal = 16843564; // 0x101032c
field public static final int dividerPadding = 16843562; // 0x101032a
field public static final int dividerVertical = 16843530; // 0x101030a
- field public static final int documentLaunchMode = 16843858; // 0x1010452
+ field public static final int documentLaunchMode = 16843852; // 0x101044c
field public static final int drawSelectorOnTop = 16843004; // 0x10100fc
field public static final int drawable = 16843161; // 0x1010199
field public static final int drawableBottom = 16843118; // 0x101016e
@@ -487,14 +486,13 @@ package android {
field public static final int dropDownWidth = 16843362; // 0x1010262
field public static final int duplicateParentState = 16842985; // 0x10100e9
field public static final int duration = 16843160; // 0x1010198
- field public static final int durations = 16843814; // 0x1010426
field public static final int editTextBackground = 16843602; // 0x1010352
field public static final int editTextColor = 16843601; // 0x1010351
field public static final int editTextPreferenceStyle = 16842898; // 0x1010092
field public static final int editTextStyle = 16842862; // 0x101006e
field public static final deprecated int editable = 16843115; // 0x101016b
field public static final int editorExtras = 16843300; // 0x1010224
- field public static final int elevation = 16843853; // 0x101044d
+ field public static final int elevation = 16843847; // 0x1010447
field public static final int ellipsize = 16842923; // 0x10100ab
field public static final int ems = 16843096; // 0x1010158
field public static final int enabled = 16842766; // 0x101000e
@@ -504,9 +502,9 @@ package android {
field public static final int entries = 16842930; // 0x10100b2
field public static final int entryValues = 16843256; // 0x10101f8
field public static final int eventsInterceptionEnabled = 16843389; // 0x101027d
- field public static final int excludeClass = 16843855; // 0x101044f
+ field public static final int excludeClass = 16843849; // 0x1010449
field public static final int excludeFromRecents = 16842775; // 0x1010017
- field public static final int excludeId = 16843854; // 0x101044e
+ field public static final int excludeId = 16843848; // 0x1010448
field public static final int exitFadeDuration = 16843533; // 0x101030d
field public static final int expandableListPreferredChildIndicatorLeft = 16842834; // 0x1010052
field public static final int expandableListPreferredChildIndicatorRight = 16842835; // 0x1010053
@@ -535,11 +533,11 @@ package android {
field public static final int fastScrollTextColor = 16843609; // 0x1010359
field public static final int fastScrollThumbDrawable = 16843574; // 0x1010336
field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339
- field public static final int fill = 16843809; // 0x1010421
+ field public static final int fill = 16843808; // 0x1010420
field public static final int fillAfter = 16843197; // 0x10101bd
field public static final int fillBefore = 16843196; // 0x10101bc
field public static final int fillEnabled = 16843343; // 0x101024f
- field public static final int fillOpacity = 16843808; // 0x1010420
+ field public static final int fillOpacity = 16843807; // 0x101041f
field public static final int fillViewport = 16843130; // 0x101017a
field public static final int filter = 16843035; // 0x101011b
field public static final int filterTouchesWhenObscured = 16843460; // 0x10102c4
@@ -601,7 +599,7 @@ package android {
field public static final int headerBackground = 16843055; // 0x101012f
field public static final int headerDividersEnabled = 16843310; // 0x101022e
field public static final int height = 16843093; // 0x1010155
- field public static final int hideOnContentScroll = 16843856; // 0x1010450
+ field public static final int hideOnContentScroll = 16843850; // 0x101044a
field public static final int hint = 16843088; // 0x1010150
field public static final int homeAsUpIndicator = 16843531; // 0x101030b
field public static final int homeLayout = 16843549; // 0x101031d
@@ -771,7 +769,6 @@ package android {
field public static final int layout_x = 16843135; // 0x101017f
field public static final int layout_y = 16843136; // 0x1010180
field public static final int left = 16843181; // 0x10101ad
- field public static final int limitTo = 16843824; // 0x1010430
field public static final int lineSpacingExtra = 16843287; // 0x1010217
field public static final int lineSpacingMultiplier = 16843288; // 0x1010218
field public static final int lines = 16843092; // 0x1010154
@@ -833,7 +830,7 @@ package android {
field public static final int name = 16842755; // 0x1010003
field public static final int navigationMode = 16843471; // 0x10102cf
field public static final int negativeButtonText = 16843254; // 0x10101f6
- field public static final int nestedScrollingEnabled = 16843843; // 0x1010443
+ field public static final int nestedScrollingEnabled = 16843837; // 0x101043d
field public static final int nextFocusDown = 16842980; // 0x10100e4
field public static final int nextFocusForward = 16843580; // 0x101033c
field public static final int nextFocusLeft = 16842977; // 0x10100e1
@@ -875,18 +872,18 @@ package android {
field public static final int parentActivityName = 16843687; // 0x10103a7
field public static final deprecated int password = 16843100; // 0x101015c
field public static final int path = 16842794; // 0x101002a
- field public static final int pathData = 16843810; // 0x1010422
+ field public static final int pathData = 16843809; // 0x1010421
field public static final int pathPattern = 16842796; // 0x101002c
field public static final int pathPrefix = 16842795; // 0x101002b
field public static final int permission = 16842758; // 0x1010006
field public static final int permissionFlags = 16843719; // 0x10103c7
field public static final int permissionGroup = 16842762; // 0x101000a
field public static final int permissionGroupFlags = 16843717; // 0x10103c5
- field public static final int persistable = 16843833; // 0x1010439
+ field public static final int persistable = 16843827; // 0x1010433
field public static final int persistent = 16842765; // 0x101000d
field public static final int persistentDrawingCache = 16842990; // 0x10100ee
field public static final deprecated int phoneNumber = 16843111; // 0x1010167
- field public static final int pinned = 16843826; // 0x1010432
+ field public static final int pinned = 16843820; // 0x101042c
field public static final int pivotX = 16843189; // 0x10101b5
field public static final int pivotY = 16843190; // 0x10101b6
field public static final int popupAnimationStyle = 16843465; // 0x10102c9
@@ -941,7 +938,6 @@ package android {
field public static final int readPermission = 16842759; // 0x1010007
field public static final int repeatCount = 16843199; // 0x10101bf
field public static final int repeatMode = 16843200; // 0x10101c0
- field public static final int repeatStyle = 16843816; // 0x1010428
field public static final int reqFiveWayNav = 16843314; // 0x1010232
field public static final int reqHardKeyboard = 16843305; // 0x1010229
field public static final int reqKeyboardType = 16843304; // 0x1010228
@@ -951,7 +947,7 @@ package android {
field public static final int required = 16843406; // 0x101028e
field public static final int requiredAccountType = 16843734; // 0x10103d6
field public static final int requiredForAllUsers = 16843728; // 0x10103d0
- field public static final int requiredForProfile = 16843825; // 0x1010431
+ field public static final int requiredForProfile = 16843819; // 0x101042b
field public static final int requiresFadingEdge = 16843685; // 0x10103a5
field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364
field public static final int resizeMode = 16843619; // 0x1010363
@@ -1015,8 +1011,7 @@ package android {
field public static final int selectableItemBackground = 16843534; // 0x101030e
field public static final int selectedDateVerticalBar = 16843591; // 0x1010347
field public static final int selectedWeekBackgroundColor = 16843586; // 0x1010342
- field public static final int sequence = 16843815; // 0x1010427
- field public static final int sessionService = 16843850; // 0x101044a
+ field public static final int sessionService = 16843844; // 0x1010444
field public static final int settingsActivity = 16843301; // 0x1010225
field public static final int shadowColor = 16843105; // 0x1010161
field public static final int shadowDx = 16843106; // 0x1010162
@@ -1038,7 +1033,7 @@ package android {
field public static final int shrinkColumns = 16843082; // 0x101014a
field public static final deprecated int singleLine = 16843101; // 0x101015d
field public static final int singleUser = 16843711; // 0x10103bf
- field public static final int slideEdge = 16843836; // 0x101043c
+ field public static final int slideEdge = 16843830; // 0x1010436
field public static final int smallIcon = 16843422; // 0x101029e
field public static final int smallScreens = 16843396; // 0x1010284
field public static final int smoothScrollbar = 16843313; // 0x1010231
@@ -1055,13 +1050,13 @@ package android {
field public static final int sspPattern = 16843749; // 0x10103e5
field public static final int sspPrefix = 16843748; // 0x10103e4
field public static final int stackFromBottom = 16843005; // 0x10100fd
- field public static final int stackViewStyle = 16843851; // 0x101044b
+ field public static final int stackViewStyle = 16843845; // 0x1010445
field public static final int starStyle = 16842882; // 0x1010082
field public static final int startColor = 16843165; // 0x101019d
field public static final int startDelay = 16843746; // 0x10103e2
field public static final int startOffset = 16843198; // 0x10101be
field public static final deprecated int startYear = 16843132; // 0x101017c
- field public static final int stateListAnimator = 16843860; // 0x1010454
+ field public static final int stateListAnimator = 16843854; // 0x101044e
field public static final int stateNotNeeded = 16842774; // 0x1010016
field public static final int state_above_anchor = 16842922; // 0x10100aa
field public static final int state_accelerated = 16843547; // 0x101031b
@@ -1091,13 +1086,13 @@ 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 stroke = 16843811; // 0x1010423
- field public static final int strokeLineCap = 16843820; // 0x101042c
- field public static final int strokeLineJoin = 16843821; // 0x101042d
- field public static final int strokeOpacity = 16843812; // 0x1010424
- field public static final int strokeWidth = 16843813; // 0x1010425
+ field public static final int stroke = 16843810; // 0x1010422
+ field public static final int strokeLineCap = 16843816; // 0x1010428
+ field public static final int strokeLineJoin = 16843817; // 0x1010429
+ field public static final int strokeOpacity = 16843811; // 0x1010423
+ field public static final int strokeWidth = 16843812; // 0x1010424
field public static final int subtitle = 16843473; // 0x10102d1
- field public static final int subtitleTextAppearance = 16843835; // 0x101043b
+ field public static final int subtitleTextAppearance = 16843829; // 0x1010435
field public static final int subtitleTextStyle = 16843513; // 0x10102f9
field public static final int subtypeExtraValue = 16843674; // 0x101039a
field public static final int subtypeId = 16843713; // 0x10103c1
@@ -1114,7 +1109,7 @@ package android {
field public static final int switchMinWidth = 16843632; // 0x1010370
field public static final int switchPadding = 16843633; // 0x1010371
field public static final int switchPreferenceStyle = 16843629; // 0x101036d
- field public static final int switchStyle = 16843852; // 0x101044c
+ field public static final int switchStyle = 16843846; // 0x1010446
field public static final int switchTextAppearance = 16843630; // 0x101036e
field public static final int switchTextOff = 16843628; // 0x101036c
field public static final int switchTextOn = 16843627; // 0x101036b
@@ -1151,7 +1146,7 @@ package android {
field public static final int textAppearanceLargeInverse = 16842819; // 0x1010043
field public static final int textAppearanceLargePopupMenu = 16843521; // 0x1010301
field public static final int textAppearanceListItem = 16843678; // 0x101039e
- field public static final int textAppearanceListItemSecondary = 16843838; // 0x101043e
+ field public static final int textAppearanceListItemSecondary = 16843832; // 0x1010438
field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f
field public static final int textAppearanceMedium = 16842817; // 0x1010041
field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044
@@ -1215,7 +1210,7 @@ package android {
field public static final int tintMode = 16843798; // 0x1010416
field public static final int title = 16843233; // 0x10101e1
field public static final int titleCondensed = 16843234; // 0x10101e2
- field public static final int titleTextAppearance = 16843834; // 0x101043a
+ field public static final int titleTextAppearance = 16843828; // 0x1010434
field public static final int titleTextStyle = 16843512; // 0x10102f8
field public static final int toAlpha = 16843211; // 0x10101cb
field public static final int toDegrees = 16843188; // 0x10101b4
@@ -1240,10 +1235,9 @@ package android {
field public static final int translationX = 16843554; // 0x1010322
field public static final int translationY = 16843555; // 0x1010323
field public static final int translationZ = 16843797; // 0x1010415
- field public static final int trigger = 16843805; // 0x101041d
- field public static final int trimPathEnd = 16843818; // 0x101042a
- field public static final int trimPathOffset = 16843819; // 0x101042b
- field public static final int trimPathStart = 16843817; // 0x1010429
+ field public static final int trimPathEnd = 16843814; // 0x1010426
+ field public static final int trimPathOffset = 16843815; // 0x1010427
+ field public static final int trimPathStart = 16843813; // 0x1010425
field public static final int type = 16843169; // 0x10101a1
field public static final int typeface = 16842902; // 0x1010096
field public static final int uiOptions = 16843672; // 0x1010398
@@ -1268,8 +1262,8 @@ package android {
field public static final int verticalGap = 16843328; // 0x1010240
field public static final int verticalScrollbarPosition = 16843572; // 0x1010334
field public static final int verticalSpacing = 16843029; // 0x1010115
- field public static final int viewportHeight = 16843807; // 0x101041f
- field public static final int viewportWidth = 16843806; // 0x101041e
+ field public static final int viewportHeight = 16843806; // 0x101041e
+ field public static final int viewportWidth = 16843805; // 0x101041d
field public static final int visibility = 16842972; // 0x10100dc
field public static final int visible = 16843156; // 0x1010194
field public static final int vmSafeMode = 16843448; // 0x10102b8
@@ -1298,8 +1292,8 @@ package android {
field public static final int windowActionBar = 16843469; // 0x10102cd
field public static final int windowActionBarOverlay = 16843492; // 0x10102e4
field public static final int windowActionModeOverlay = 16843485; // 0x10102dd
- field public static final int windowAllowEnterTransitionOverlap = 16843849; // 0x1010449
- field public static final int windowAllowExitTransitionOverlap = 16843848; // 0x1010448
+ field public static final int windowAllowEnterTransitionOverlap = 16843843; // 0x1010443
+ field public static final int windowAllowExitTransitionOverlap = 16843842; // 0x1010442
field public static final int windowAnimationStyle = 16842926; // 0x10100ae
field public static final int windowBackground = 16842836; // 0x1010054
field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b
@@ -1309,9 +1303,9 @@ package android {
field public static final int windowDisablePreview = 16843298; // 0x1010222
field public static final int windowEnableSplitTouch = 16843543; // 0x1010317
field public static final int windowEnterAnimation = 16842932; // 0x10100b4
- field public static final int windowEnterTransition = 16843844; // 0x1010444
+ field public static final int windowEnterTransition = 16843838; // 0x101043e
field public static final int windowExitAnimation = 16842933; // 0x10100b5
- field public static final int windowExitTransition = 16843845; // 0x1010445
+ field public static final int windowExitTransition = 16843839; // 0x101043f
field public static final int windowFrame = 16842837; // 0x1010055
field public static final int windowFullscreen = 16843277; // 0x101020d
field public static final int windowHideAnimation = 16842935; // 0x10100b7
@@ -1322,8 +1316,8 @@ package android {
field public static final int windowNoDisplay = 16843294; // 0x101021e
field public static final int windowNoTitle = 16842838; // 0x1010056
field public static final int windowOverscan = 16843727; // 0x10103cf
- field public static final int windowSharedElementEnterTransition = 16843846; // 0x1010446
- field public static final int windowSharedElementExitTransition = 16843847; // 0x1010447
+ field public static final int windowSharedElementEnterTransition = 16843840; // 0x1010440
+ field public static final int windowSharedElementExitTransition = 16843841; // 0x1010441
field public static final int windowShowAnimation = 16842934; // 0x10100b6
field public static final int windowShowWallpaper = 16843410; // 0x1010292
field public static final int windowSoftInputMode = 16843307; // 0x101022b