Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further cleaning on animated part of VectorDrawable.

Browse Source 
State changed support is gone.
Rename VAnimatedPath.
Remove the obsolete documents.
Update the tests to reflect the API changes.

Change-Id: Icdc19c6519a4e29975877c1d167e61c8fa14a371
This commit is contained in:
ztenghui
2014-05-06 11:07:37 -07:00
parent f73c8401a6
commit ddbbb8ae85
24 changed files with 78 additions and 1493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
api/current.txt
View File

@@ -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

46
core/res/res/drawable/btn_check_quantum_anim.xml
View File

@@ -14,7 +14,6 @@
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:trigger="state_checked"
android:versionCode="1" >
<size
@@ -25,55 +24,10 @@
android:viewportHeight="320"
android:viewportWidth="320" />
<group>
<path
android:name="box1"
android:pathData="M 240,80 L 240,240 L 80,240 L 80,80 L 240,80 L 240,80 z"
android:stroke="?attr/colorControlNormal"
android:strokeWidth="20"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
<group>
<path
android:name="box2"
android:pathData="M 160,200 L 160,240 L 120,240 L 120,200 L 160,200 L 160,200 z"
android:stroke="?attr/colorControlNormal"
android:strokeWidth="10"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
<group>
<path
android:name="box3"
android:pathData="M 160,216.5 L 143.5,240 L 120,223.5 L 136.5,200 L 160,216.5 L 160,216.5 z"
android:rotation="35"
android:pivotX="140"
android:pivotY="220"
android:fill="?attr/colorControlNormal"
android:stroke="?attr/colorControlNormal"
android:strokeWidth="5"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
<group>
<path
android:name="box4"
android:pathData="M 160,216.5 L 143.5,240 L 120,223.5 L 136.5,200 L 160,216.5 L 160,216.5 z"
android:fill="?attr/colorControlActivated"
android:stroke="?attr/colorControlActivated"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
<group>
<path
android:name="check"
android:pathData="M 232.1,80.6 L 248.5,92.1 L 145.2,239.5 L 71.5,187.8 L 83,171.5 L 140.3,211.7 z"
android:fill="?attr/colorControlActivated" />
</group>
<animation
android:durations="300,100,0,300"
android:sequence="box1,box2,box3,box4,check" />
</vector>

68
core/res/res/values/attrs.xml
View File

@@ -4660,18 +4660,6 @@
<!-- Drawable used to draw Vector Drawables. -->
<declare-styleable name="VectorDrawable">
<!-- What event triggers the animation -->
<attr name="trigger" format="enum">
<enum name="state_pressed" value="1" />
<enum name="state_focused" value="2" />
<enum name="state_hovered" value="3" />
<enum name="state_selected" value="4" />
<enum name="state_checkable" value="5" />
<enum name="state_checked" value="6" />
<enum name="state_enabled" value="7" />
<enum name="state_activated" value="8" />
<enum name="state_window_focused" value="9" />
</attr>
<attr name="versionCode" />
</declare-styleable>
@@ -4691,42 +4679,6 @@
<attr name="height" />
</declare-styleable>
<!-- Define the animations of drawable -->
<declare-styleable name="VectorDrawableAnimation">
<!-- Configures this animation sequence between the named paths -->
<attr name="sequence" format="string"/>
<!-- Limits an animation to only interpolate the selected variable -->
<attr name="limitTo" format="enum">
<enum name="unlimited" value="0"/>
<enum name="path" value="1"/>
<enum name="rotation" value="2"/>
<enum name="trimPathStart" value="3"/>
<enum name="trimPathEnd" value="4"/>
<enum name="trimPathOffset" value="5"/>
</attr>
<!-- Number of times to loop this aspect of the animation -->
<attr name="repeatCount"/>
<!-- A list of times in milliseconds to transision from on path to another.
List must contain one less than the number of named paths
e.g. given sequence="A,B,C,D" durations="100,0,100" implies 100ms for the
"A" to "B" transision instantanious switch to "C" and 100ms for "C" to "D". -->
<attr name="durations" format="string" />
<!-- The delay before stating this aspect of the animation in milli seconds -->
<attr name="startDelay" />
<!-- when repeating how does it repeat back and forth or a to b -->
<attr name="repeatStyle" format="enum">
<enum name="forward" value="0"/>
<enum name="reverse" value="1"/>[]
</attr>
<!-- how does the animation progress from start to finish -->
<attr name="animate" format="enum">
<enum name="linear" value="0"/>
<enum name="easeIn" value="1"/>
<enum name="easeOut" value="2"/>
<enum name="easeInOut" value="3"/>
</attr>
</declare-styleable>
<!-- Defines the path used in Vector Drawables. -->
<declare-styleable name="VectorDrawablePath">
<!-- The Name of this path -->
@@ -4771,26 +4723,6 @@
</attr>
<!-- sets the Miter limit for a stroked path -->
<attr name="strokeMiterLimit" format="float"/>
<!-- sets a condition to be met to draw path -->
<attr name="state_pressed" />
<!-- sets a condition to be met to draw path -->
<attr name="state_focused" />
<!-- sets a condition to be met to draw path -->
<attr name="state_selected" />
<!-- sets a condition to be met to draw path -->
<attr name="state_window_focused" />
<!-- sets a condition to be met to draw path -->
<attr name="state_enabled" />
<!-- sets a condition to be met to draw path -->
<attr name="state_activated" />
<!-- sets a condition to be met to draw path -->
<attr name="state_accelerated" />
<!-- sets a condition to be met to draw path -->
<attr name="state_hovered" />
<!-- sets a condition to be met to draw path -->
<attr name="state_checked" />
<!-- sets a condition to be met to draw path -->
<attr name="state_checkable" />
</declare-styleable>
<!-- ========================== -->

6
core/res/res/values/public.xml
View File

@@ -2116,7 +2116,6 @@
<public type="attr" name="controlY2" />
<public type="attr" name="sharedElementName" />
<public type="attr" name="transitionGroup" />
<public type="attr" name="trigger" />
<public type="attr" name="viewportWidth" />
<public type="attr" name="viewportHeight" />
<public type="attr" name="fillOpacity" />
@@ -2125,17 +2124,12 @@
<public type="attr" name="stroke" />
<public type="attr" name="strokeOpacity" />
<public type="attr" name="strokeWidth" />
<public type="attr" name="durations" />
<public type="attr" name="sequence" />
<public type="attr" name="repeatStyle" />
<public type="attr" name="trimPathStart" />
<public type="attr" name="trimPathEnd" />
<public type="attr" name="trimPathOffset" />
<public type="attr" name="strokeLineCap" />
<public type="attr" name="strokeLineJoin" />
<public type="attr" name="clipToPath" />
<public type="attr" name="animate" />
<public type="attr" name="limitTo" />
<public type="attr" name="requiredForProfile"/>
<public type="attr" name="pinned" />
<public type="attr" name="colorControlNormal" />

782
graphics/java/android/graphics/drawable/VectorDrawable.java
View File

File diff suppressed because it is too large Load Diff

46
tests/VectorDrawableTest/res/drawable/vector_drawable01.xml
View File

@@ -14,7 +14,7 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:trigger="state_checked" android:versionCode="1" >
android:versionCode="1" >
<size
android:height="48dp"
@@ -24,55 +24,13 @@
android:viewportHeight="480"
android:viewportWidth="480" />
<group>
<path
android:name="check"
android:pathData="m20,200l100,90l180,-180l-35,-35l-145,145l-60,-60l-40,40z"
android:fill="?android:attr/colorControlActivated" />
</group>
<group>
<path
android:name="box1"
android:pathData="m127,171l37,38l33,-31l-37,-40l-1,3l-2,0l-30,30z"
android:pathData="m20,200l100,90l180,-180l-35,-35l-145,145l-60,-60l-40,40z"
android:fill="?android:attr/colorControlActivated"
android:stroke="?android:attr/colorControlActivated"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
<group>
<path
android:name="box2"
android:pathData="m127,171l37,38l33,-31l-37,-40l-1,3l-2,0l-30,30z"
android:rotation="46.757"
android:pivotX="162"
android:pivotY="173.5"
android:fill="?android:attr/colorControlNormal"
android:stroke="?android:attr/colorControlNormal"
android:strokeWidth="3"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
<group>
<path
android:name="box3"
android:pathData="m187,147l-1,55l-49,-1l2,-53l48,0z"
android:stroke="?android:attr/colorControlNormal"
android:strokeWidth="10"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
<group>
<path
android:name="box4"
android:pathData="m248,74l0,164l-177,0l1,-165l173,-1l3,2z"
android:stroke="?android:attr/colorControlNormal"
android:strokeWidth="30"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</group>
<animation
android:durations="300,100,0,300"
android:sequence="check,box1,box2,box3,box4" />
</vector>

9
tests/VectorDrawableTest/res/drawable/vector_drawable02.xml
View File

@@ -21,14 +21,6 @@
<viewport android:viewportWidth="320"
android:viewportHeight="320"/>
<group>
<path
android:name="arrow"
android:pathData="M 100,225 L 100,115 L 130,115 L 70,15 L 10,115 L 40,115 L 40,225 z"
android:fill="#ffffffff"
android:stroke="#FF00FF00"
android:strokeWidth="1"/>
</group>
<group>
<path
android:name="house"
@@ -42,5 +34,4 @@
android:trimPathStart=".1"
android:trimPathEnd=".9"/>
</group>
<animation android:sequence="arrow,house"/>
</vector>

63
tests/VectorDrawableTest/res/drawable/vector_drawable03.xml
View File

@@ -71,67 +71,4 @@
android:fill="#ff88ff"
/>
</group>
<group>
<path
android:name="clip1"
android:pathData="
M 0, 0
l 7.3, 0
l 0, 12.25
l -7.3, 0
z"
android:clipToPath="true"
android:rotation="-30"
android:pivotX="3.65"
android:pivotY="6.125"
/>
<path
android:name="one"
android:pathData="M 1.215625,9.5l 1.9375,0.0 0.0,-6.671875 -2.109375,0.421875 0.0,-1.078125
l 2.09375,-0.421875 1.1874998,0.0 0.0,7.75 1.9375,0.0 0.0,1.0
l -5.046875,0.0 0.0,-1.0Z"
android:fill="#ff88ff"
/>
<path
android:name="clip2"
android:pathData="
M 0, 12.25
l 7.3, 0
l 0, 12.25
l -7.3, 0
z"
android:clipToPath="true"
android:rotation="-30"
android:pivotX="3.65"
android:pivotY="6.125"
/>
<path
android:name="two"
android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0 -5.5625,0.0 0.0,-1.0q 0.671875,-0.6875 1.828125,-1.859375
q 1.1718752,-1.1875 1.4687502,-1.53125 0.578125,-0.625 0.796875,-1.0625
q 0.234375,-0.453125 0.234375,-0.875 0.0,-0.703125 -0.5,-1.140625
q -0.484375,-0.4375 -1.2656252,-0.4375 -0.5625,0.0 -1.1875,0.1875
q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875
q 0.625,-0.15625 1.140625,-0.15625 1.3593752,0.0 2.1718752,0.6875
q 0.8125,0.671875 0.8125,1.8125 0.0,0.53125 -0.203125,1.015625
q -0.203125,0.484375 -0.734375,1.140625 -0.15625,0.171875 -0.9375,0.984375
q -0.78125024,0.8125 -2.2187502,2.265625Z"
android:fill="#ff88ff"
/>
</group>
<animation
android:sequence="one,one"
android:durations="4000"/>
<animation
android:sequence="two,two"
android:durations="4000"/>
<animation
android:sequence="clip1,clip1"
android:durations="4000"/>
<animation
android:sequence="clip2,clip2"
android:durations="4000"/>
</vector>

58
tests/VectorDrawableTest/res/drawable/vector_drawable04.xml
View File

@@ -65,62 +65,4 @@
android:fill="#ff88ff"
/>
</group>
<group>
<path
android:name="clip1"
android:pathData="
M 3.65, 6.125
m -6, 0
a 6,6 0 1,0 12,0
a 6,6 0 1,0 -12,0z"
android:clipToPath="true"
android:fill="#332233"
/>
<path
android:name="one"
android:pathData="M 1.215625,9.5l 1.9375,0.0 0.0,-6.671875 -2.109375,0.421875 0.0,-1.078125
l 2.09375,-0.421875 1.1874998,0.0 0.0,7.75 1.9375,0.0 0.0,1.0
l -5.046875,0.0 0.0,-1.0Z"
android:fill="#ff88ff"
/>
<path
android:name="clip2"
android:pathData="
M 3.65, 6.125
m -.001, 0
a .001,.001 0 1,0 .002,0
a .001,.001 0 1,0 -.002,0z"
android:clipToPath="true"
android:fill="#662233"
/>
<path
android:name="two"
android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0 -5.5625,0.0 0.0,-1.0q 0.671875,-0.6875 1.828125,-1.859375
q 1.1718752,-1.1875 1.4687502,-1.53125 0.578125,-0.625 0.796875,-1.0625
q 0.234375,-0.453125 0.234375,-0.875 0.0,-0.703125 -0.5,-1.140625
q -0.484375,-0.4375 -1.2656252,-0.4375 -0.5625,0.0 -1.1875,0.1875
q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875
q 0.625,-0.15625 1.140625,-0.15625 1.3593752,0.0 2.1718752,0.6875
q 0.8125,0.671875 0.8125,1.8125 0.0,0.53125 -0.203125,1.015625
q -0.203125,0.484375 -0.734375,1.140625 -0.15625,0.171875 -0.9375,0.984375
q -0.78125024,0.8125 -2.2187502,2.265625Z"
android:fill="#ff88ff"
/>
</group>
<animation
android:sequence="one,one"
android:durations="4000"/>
<animation
android:sequence="two,two"
android:durations="4000"/>
<animation
android:sequence="clip1,clip1"
android:durations="4000"/>
<animation
android:sequence="clip2,clip2"
android:durations="4000"/>
</vector>

91
tests/VectorDrawableTest/res/drawable/vector_drawable05.xml
View File

@@ -44,95 +44,4 @@
q -0.203125,0.484375 -0.734375,1.140625 -0.15625,0.171875 -0.9375,0.984375
q -0.78125024,0.8125 -2.2187502,2.265625Z" />
</group>
<group>
<path
android:name="one"
android:fill="#ffff00"
android:fillOpacity="0"
android:pathData="M 1.215625,9.5l 1.9375,0.0 0.0,-6.671875 -2.109375,0.421875 0.0,-1.078125
l 2.09375,-0.421875 1.1874998,0.0 0.0,7.75 1.9375,0.0 0.0,1.0
l -5.046875,0.0 0.0,-1.0Z" />
<path
android:name="two"
android:fill="#ffff00"
android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0 -5.5625,0.0 0.0,-1.0q 0.671875,-0.6875 1.828125,-1.859375
q 1.1718752,-1.1875 1.4687502,-1.53125 0.578125,-0.625 0.796875,-1.0625
q 0.234375,-0.453125 0.234375,-0.875 0.0,-0.703125 -0.5,-1.140625
q -0.484375,-0.4375 -1.2656252,-0.4375 -0.5625,0.0 -1.1875,0.1875
q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875
q 0.625,-0.15625 1.140625,-0.15625 1.3593752,0.0 2.1718752,0.6875
q 0.8125,0.671875 0.8125,1.8125 0.0,0.53125 -0.203125,1.015625
q -0.203125,0.484375 -0.734375,1.140625 -0.15625,0.171875 -0.9375,0.984375
q -0.78125024,0.8125 -2.2187502,2.265625Z" />
</group>
<group>
<path
android:name="two"
android:fill="#ffff00"
android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0 -5.5625,0.0 0.0,-1.0q 0.671875,-0.6875 1.828125,-1.859375
q 1.1718752,-1.1875 1.4687502,-1.53125 0.578125,-0.625 0.796875,-1.0625
q 0.234375,-0.453125 0.234375,-0.875 0.0,-0.703125 -0.5,-1.140625
q -0.484375,-0.4375 -1.2656252,-0.4375 -0.5625,0.0 -1.1875,0.1875
q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875
q 0.625,-0.15625 1.140625,-0.15625 1.3593752,0.0 2.1718752,0.6875
q 0.8125,0.671875 0.8125,1.8125 0.0,0.53125 -0.203125,1.015625
q -0.203125,0.484375 -0.734375,1.140625 -0.15625,0.171875 -0.9375,0.984375
q -0.78125024,0.8125 -2.2187502,2.265625Z" />
<path
android:name="three"
android:fill="#ffff00"
android:fillOpacity="0"
android:pathData="M 5.103125,6.003125q 0.84375,0.1875 1.3125,0.765625 0.484375,0.5625 0.484375,1.40625
q 0.0,1.296875 -0.890625,2.015625 -0.890625,0.703125 -2.53125,0.703125
q -0.546875,0.0 -1.140625,-0.109375 -0.5781251,-0.109375 -1.1875001,-0.328125
l 0.0,-1.140625q 0.484375,0.28125 1.0625001,0.4375 0.59375,0.140625 1.234375,0.140625
q 1.109375,0.0 1.6875,-0.4375 0.59375,-0.4375 0.59375,-1.28125
q 0.0,-0.765625 -0.546875,-1.203125 -0.546875,-0.4375 -1.5,-0.4375
l -1.03125,0.0 0.0,-0.96875 1.078125,0.0q 0.859375,0.0 1.328125,-0.34375
q 0.46875,-0.359375 0.46875,-1.015625 0.0,-0.671875 -0.484375,-1.03125
q -0.46875,-0.359375 -1.359375,-0.359375 -0.5,0.0 -1.0625,0.109375
q -0.546875,0.09375 -1.2187501,0.3125l 0.0,-1.046875q 0.6875001,-0.1875 1.2656251,-0.28125
q 0.59375,-0.09375 1.109375,-0.09375 1.359375,0.0 2.140625,0.609375
q 0.78125,0.609375 0.78125,1.65625 0.0,0.734375 -0.421875,1.234375
q -0.40625,0.5 -1.171875,0.6875Z" />
</group>
<group>
<path
android:name="two"
android:fill="#ffff00"
android:fillOpacity="0"
android:pathData="M 2.534375,9.6875l 4.140625,0.0 0.0,1.0 -5.5625,0.0 0.0,-1.0q 0.671875,-0.6875 1.828125,-1.859375
q 1.1718752,-1.1875 1.4687502,-1.53125 0.578125,-0.625 0.796875,-1.0625
q 0.234375,-0.453125 0.234375,-0.875 0.0,-0.703125 -0.5,-1.140625
q -0.484375,-0.4375 -1.2656252,-0.4375 -0.5625,0.0 -1.1875,0.1875
q -0.609375,0.1875 -1.3125,0.59375l 0.0,-1.203125q 0.71875,-0.28125 1.328125,-0.421875
q 0.625,-0.15625 1.140625,-0.15625 1.3593752,0.0 2.1718752,0.6875
q 0.8125,0.671875 0.8125,1.8125 0.0,0.53125 -0.203125,1.015625
q -0.203125,0.484375 -0.734375,1.140625 -0.15625,0.171875 -0.9375,0.984375
q -0.78125024,0.8125 -2.2187502,2.265625Z" />
<path
android:name="three"
android:fill="#ffff00"
android:pathData="M 5.103125,6.003125q 0.84375,0.1875 1.3125,0.765625 0.484375,0.5625 0.484375,1.40625
q 0.0,1.296875 -0.890625,2.015625 -0.890625,0.703125 -2.53125,0.703125
q -0.546875,0.0 -1.140625,-0.109375 -0.5781251,-0.109375 -1.1875001,-0.328125
l 0.0,-1.140625q 0.484375,0.28125 1.0625001,0.4375 0.59375,0.140625 1.234375,0.140625
q 1.109375,0.0 1.6875,-0.4375 0.59375,-0.4375 0.59375,-1.28125
q 0.0,-0.765625 -0.546875,-1.203125 -0.546875,-0.4375 -1.5,-0.4375
l -1.03125,0.0 0.0,-0.96875 1.078125,0.0q 0.859375,0.0 1.328125,-0.34375
q 0.46875,-0.359375 0.46875,-1.015625 0.0,-0.671875 -0.484375,-1.03125
q -0.46875,-0.359375 -1.359375,-0.359375 -0.5,0.0 -1.0625,0.109375
q -0.546875,0.09375 -1.2187501,0.3125l 0.0,-1.046875q 0.6875001,-0.1875 1.2656251,-0.28125
q 0.59375,-0.09375 1.109375,-0.09375 1.359375,0.0 2.140625,0.609375
q 0.78125,0.609375 0.78125,1.65625 0.0,0.734375 -0.421875,1.234375
q -0.40625,0.5 -1.171875,0.6875Z" />
</group>
<animation
android:durations="2000,0,2000"
android:sequence="one,one,three,three" />
<animation
android:durations="2000,0,2000"
android:sequence="two,two,two,two" />
</vector>

28
tests/VectorDrawableTest/res/drawable/vector_drawable06.xml
View File

@@ -22,29 +22,6 @@
android:viewportWidth="700"
android:viewportHeight="700"/>
<group>
</group>
<path android:pathData="M 569.374 461.472L 569.374 160.658L 160.658 160.658L 160.658 461.472L 569.374 461.472z"
android:name="path2451"
android:stroke="#FF000000"
android:strokeWidth="30.65500000000000"/>
<path android:pathData="M 365.015 311.066"
android:name="path2453"
android:stroke="#FF000000"
android:strokeWidth="30.655000000000001"/>
<path android:pathData="M 164.46 164.49L 340.78 343.158C 353.849 356.328 377.63 356.172 390.423 343.278L 566.622 165.928"
android:name="path2455"
android:stroke="#FF000000"
android:fill="#FF0000FF"
android:strokeWidth="30.655000000000001"/>
<path android:pathData="M 170.515 451.566L 305.61 313.46"
android:name="path2457"
android:stroke="#000000"
android:strokeWidth="30.655000000000001"/>
<path android:pathData="M 557.968 449.974L 426.515 315.375"
android:name="path2459"
android:stroke="#000000"
android:strokeWidth="30.655000000000001"/>
<group>
<path android:pathData="M 569.374 461.472L 569.374 160.658L 160.658 160.658L 160.658 461.472L 569.374 461.472z"
android:name="path2451"
@@ -68,9 +45,4 @@
android:stroke="#000000"
android:strokeWidth="30.655000000000001"/>
</group>
<animation android:sequence="path2451,path2451"
android:durations="1000"/>
</vector>

15
tests/VectorDrawableTest/res/drawable/vector_drawable07.xml
View File

@@ -19,14 +19,7 @@
<viewport android:viewportWidth="140"
android:viewportHeight="110"/>
<group>
<path
android:name="menu"
android:pathData="M 20,20 l 100,0 0,10 -100,0 z
M 20,50 l 100,0 0,10 -100,0 z
M 20,80 l 0,-10 100,0 0,10 z"
android:fill="#ffffffff"/>
</group>
<group>
<path
android:name="back"
@@ -34,12 +27,6 @@
M 27,50 l 97,0 0,10 -97,0 z
M 20,55 l 7.07,-7.07 35.3,35.3 -7.07,7.07 z"
android:fill="#ffffffff"
android:rotation="180"
android:pivotX="70"
android:pivotY="55"
/>
</group>
<animation android:sequence="menu,back"/>
</vector>

14
tests/VectorDrawableTest/res/drawable/vector_drawable08.xml
View File

@@ -31,18 +31,4 @@
android:strokeWidth="1"/>
</group>
<group>
<path
android:name="pie2"
android:pathData="M564.441,287A280.868,280.868 0 1,1 564.441,285L284.493,286.29Z"
android:fill="#FFccaa00"
android:stroke="#FF000000"
android:strokeWidth="10"
android:pivotX="90"
android:pivotY="100"/>
</group>
<animation android:sequence="pie1,pie2"/>
</vector>

8
tests/VectorDrawableTest/res/drawable/vector_drawable09.xml
View File

@@ -23,12 +23,6 @@
android:viewportHeight="200"
android:viewportWidth="200" />
<group>
<path
android:name="arrow"
android:fill="#ffffffff"
android:pathData="M 20,20 l 60,0 0,140 -60,0 z M 120,20 l 60,0 0,140 -60,0 z" />
</group>
<group>
<path
android:name="house"
@@ -39,6 +33,4 @@
android:rotation="90" />
</group>
<animation android:sequence="arrow,house" />
</vector>

71
tests/VectorDrawableTest/res/drawable/vector_drawable10.xml
View File

@@ -21,27 +21,9 @@
android:width="64dp" />
<viewport
android:viewportHeight="200"
android:viewportWidth="200" />
android:viewportWidth="200"
android:viewportHeight="200"/>
<group>
<path
android:name="bar3"
android:fill="#FFFFFFFF"
android:pathData="M49.001,60c-5.466,0 -9.899,4.478 -9.899,10s4.434,10,9.899,10c5.468,0,9.899 -4.478,9.899 -10S54.469,60,49.001,60z" />
<path
android:name="bar2"
android:fill="#FF555555"
android:pathData="M28.001,48.787l7,7.07c7.731 -7.811,20.269 -7.81,28.001,0l6.999 -7.07C58.403,37.071,39.599,37.071,28.001,48.787z" />
<path
android:name="bar1"
android:fill="#FF555555"
android:pathData="M14.001,34.645 L21,41.716c15.464 -15.621,40.536 -15.621,56,0l7.001 -7.071C64.672,15.119,33.33,15.119,14.001,34.645z" />
<path
android:name="bar0"
android:fill="#FF555555"
android:pathData="M0,20.502l6.999,7.071 c23.196 -23.431,60.806 -23.431,84.002,0L98,20.503C70.938 -6.834,27.063 -6.834,0,20.502z" />
</group>
<group>
<path
android:name="bar3"
@@ -60,54 +42,5 @@
android:fill="#FF555555"
android:pathData="M0,20.502l6.999,7.071 c23.196 -23.431,60.806 -23.431,84.002,0L98,20.503C70.938 -6.834,27.063 -6.834,0,20.502z" />
</group>
<group>
<path
android:name="bar3"
android:fill="#FFFFFFFF"
android:pathData="M49.001,60c-5.466,0 -9.899,4.478 -9.899,10s4.434,10,9.899,10c5.468,0,9.899 -4.478,9.899 -10S54.469,60,49.001,60z" />
<path
android:name="bar2"
android:fill="#FFFFFFFF"
android:pathData="M28.001,48.787l7,7.07c7.731 -7.811,20.269 -7.81,28.001,0l6.999 -7.07C58.403,37.071,39.599,37.071,28.001,48.787z" />
<path
android:name="bar1"
android:fill="#FFFFFFFF"
android:pathData="M14.001,34.645 L21,41.716c15.464 -15.621,40.536 -15.621,56,0l7.001 -7.071C64.672,15.119,33.33,15.119,14.001,34.645z" />
<path
android:name="bar0"
android:fill="#FF555555"
android:pathData="M0,20.502l6.999,7.071 c23.196 -23.431,60.806 -23.431,84.002,0L98,20.503C70.938 -6.834,27.063 -6.834,0,20.502z" />
</group>
<group>
<path
android:name="bar3"
android:fill="#FFFFFFFF"
android:pathData="M49.001,60c-5.466,0 -9.899,4.478 -9.899,10s4.434,10,9.899,10c5.468,0,9.899 -4.478,9.899 -10S54.469,60,49.001,60z" />
<path
android:name="bar2"
android:fill="#FFFFFFFF"
android:pathData="M28.001,48.787l7,7.07c7.731 -7.811,20.269 -7.81,28.001,0l6.999 -7.07C58.403,37.071,39.599,37.071,28.001,48.787z" />
<path
android:name="bar1"
android:fill="#FFFFFFFF"
android:pathData="M14.001,34.645 L21,41.716c15.464 -15.621,40.536 -15.621,56,0l7.001 -7.071C64.672,15.119,33.33,15.119,14.001,34.645z" />
<path
android:name="bar0"
android:fill="#FFFFFFFF"
android:pathData="M0,20.502l6.999,7.071 c23.196 -23.431,60.806 -23.431,84.002,0L98,20.503C70.938 -6.834,27.063 -6.834,0,20.502z" />
</group>
<animation
android:durations="500,500,500"
android:sequence="bar0,bar0,bar0,bar0" />
<animation
android:durations="500,500,500"
android:sequence="bar1,bar1,bar1,bar1" />
<animation
android:durations="500,500,500"
android:sequence="bar2,bar2,bar2,bar2" />
<animation
android:durations="500,500,500"
android:sequence="bar3,bar3,bar3,bar3" />
</vector>

20
tests/VectorDrawableTest/res/drawable/vector_drawable11.xml
View File

@@ -36,25 +36,5 @@
android:fill="#FFFF0000"
android:pathData="M 30,18.031528 L 25.579581,23.421071 L 29.370621,26.765348 L 20.096792,37 L 21.156922,28.014053 L 17,24.902844 L 20.880632,18 L 30,18.031528 z" />
</group>
<group>
<path
android:name="battery"
android:fill="#ff8833"
android:pathData="M 20.28125,2.0000002 C 17.352748,2.0000002 15,4.3527485 15,7.2812502 L 15,8.0000002 L 13.15625,8.0000002 C 9.7507553,8.0000002 7,10.750759 7,14.15625 L 7,39.84375 C 7,43.24924 9.7507558,46 13.15625,46 L 33.84375,46 C 37.249245,46 39.999999,43.24924 40,39.84375 L 40,14.15625 C 40,10.75076 37.249243,8.0000002 33.84375,8.0000002 L 32,8.0000002 L 32,7.2812502 C 32,4.3527485 29.647252,2.0000002 26.71875,2.0000002 L 20.28125,2.0000002 z"
android:rotation="0"
android:stroke="#3388ff"
android:strokeWidth="1" />
<path
android:name="spark"
android:fill="#FFFF0000"
android:pathData="M 30,18.031528 L 25.579581,23.421071 L 29.370621,26.765348 L 20.096792,37 L 21.156922,28.014053 L 17,24.902844 L 20.880632,18 L 30,18.031528 z" />
</group>
<animation
android:durations="2000"
android:sequence="spark,spark" />
<animation
android:durations="2000"
android:sequence="battery,battery" />
</vector>

43
tests/VectorDrawableTest/res/drawable/vector_drawable12.xml
View File

@@ -40,48 +40,5 @@
android:pivotY="300"
android:rotation="0" />
</group>
<group>
<path
android:name="v"
android:pathData="M300,70 l 0,-70 70,70 -70,70z"
android:pivotX="300"
android:pivotY="300"
android:rotation="360" />
<path
android:name="pie2"
android:pathData="M300,70 a230,230 0 1,0 1,0 z"
android:pivotX="300"
android:pivotY="300"
android:rotation="360"
android:stroke="#FF00FF00"
android:strokeLineCap="round"
android:strokeWidth="70"
android:trimPathEnd=".5"
android:trimPathOffset="0"
android:trimPathStart="0" />
</group>
<animation
android:animate="easeInOut"
android:durations="2000"
android:repeatCount="-1"
android:repeatStyle="forward"
android:sequence="pie1,pie2"
android:startOffset="500" />
<animation
android:animate="easeInOut"
android:durations="2000"
android:repeatCount="-1"
android:repeatStyle="forward"
android:sequence="v,v"
android:startOffset="500" />
<animation
android:animate="easeInOut"
android:durations="2800"
android:limitTo="trimPathEnd"
android:repeatCount="-1"
android:repeatStyle="reverse"
android:sequence="pie1,pie2"
android:startOffset="500" />
</vector>

35
tests/VectorDrawableTest/res/drawable/vector_drawable13.xml
View File

@@ -40,40 +40,5 @@
android:stroke="#FF0000FF"
android:strokeWidth="5" />
</group>
<group>
<path
android:name="pie2"
android:fill="#ffff0000"
android:pathData="M300,200 h-150 a150,150 0 1,0 150,-150 z"
android:pivotX="300"
android:pivotY="200"
android:rotation="360"
android:stroke="#FF00FF00"
android:strokeWidth="10" />
<path
android:name="half"
android:fill="#FFFFFF00"
android:pathData="M275,175 v-150 a150,150 0 0,0 -150,150 z"
android:pivotX="300"
android:pivotY="200"
android:rotation="-360"
android:stroke="#FF0000FF"
android:strokeWidth="5" />
</group>
<animation
android:animate="easeInOut"
android:durations="1000"
android:repeatCount="2"
android:repeatStyle="forward"
android:sequence="pie1,pie2"
android:startOffset="500" />
<animation
android:animate="easeInOut"
android:durations="1000"
android:repeatCount="5"
android:repeatStyle="forward"
android:sequence="half,half"
android:startOffset="500" />
</vector>

13
tests/VectorDrawableTest/res/drawable/vector_drawable14.xml
View File

@@ -23,17 +23,6 @@
android:viewportHeight="500"
android:viewportWidth="800" />
<group>
<path
android:name="pie1"
android:pathData="M200,450 l 50,-25
a25,25 -30 0,1 100,-50 l 50,-25
a25,50 -30 0,1 100,-50 l 50,-25
a25,75 -30 0,1 100,-50 l 50,-25
a25,100 -30 0,1 100,-50 l 50,-25"
android:stroke="#FF00FF00"
android:strokeWidth="10" />
</group>
<group>
<path
android:name="pie2"
@@ -49,6 +38,4 @@
android:strokeWidth="10" />
</group>
<animation android:sequence="pie1,pie2" />
</vector>

10
tests/VectorDrawableTest/res/drawable/vector_drawable15.xml
View File

@@ -23,14 +23,6 @@
android:viewportHeight="400"
android:viewportWidth="500" />
<group>
<path
android:name="arrow"
android:fill="#ffffffff"
android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200"
android:stroke="#FFFF0000"
android:strokeWidth="1" />
</group>
<group>
<path
android:name="house"
@@ -43,6 +35,4 @@
android:strokeWidth="10" />
</group>
<animation android:sequence="arrow,house" />
</vector>

9
tests/VectorDrawableTest/res/drawable/vector_drawable16.xml
View File

@@ -23,13 +23,6 @@
android:viewportHeight="200"
android:viewportWidth="200" />
<group>
<path
android:name="arrow"
android:pathData="M 100,10 v 180 M 10,100 h 180"
android:stroke="#FF00FF00"
android:strokeWidth="1" />
</group>
<group>
<path
android:name="house"
@@ -41,6 +34,4 @@
android:strokeWidth="10" />
</group>
<animation android:sequence="arrow,house" />
</vector>

11
tests/VectorDrawableTest/res/drawable/vector_drawable17.xml
View File

@@ -21,14 +21,6 @@
<viewport android:viewportWidth="1200"
android:viewportHeight="600"/>
<group>
<path
android:name="arrow"
android:pathData="M200,300 Q400,50 600,300 T1000,300"
android:stroke="#FF00FF00"
android:strokeWidth="1"/>
</group>
<group>
<path
android:name="house"
@@ -40,7 +32,4 @@
android:pivotY="300"/>
</group>
<animation android:sequence="arrow,house"/>
</vector>

10
tests/VectorDrawableTest/res/drawable/vector_drawable18.xml
View File

@@ -23,13 +23,6 @@
android:viewportHeight="400"
android:viewportWidth="500" />
<group>
<path
android:name="arrow"
android:pathData="M100,200 C100,100 250,100 250,200 S400,300 400,200"
android:stroke="#FFFFFF00"
android:strokeWidth="10" />
</group>
<group>
<path
android:name="house"
@@ -37,9 +30,8 @@
android:pivotX="250"
android:pivotY="200"
android:rotation="360"
android:stroke="#FFFFFF00"
android:strokeWidth="10" />
</group>
<animation android:sequence="arrow,house" />
</vector>

9
tests/VectorDrawableTest/res/drawable/vector_drawable19.xml
View File

@@ -23,13 +23,6 @@
android:viewportHeight="800"
android:viewportWidth="1000" />
<group>
<path
android:name="arrow"
android:pathData="M10,300 Q400,50 600,300 T1000,300"
android:stroke="#FF00FFFF"
android:strokeWidth="40" />
</group>
<group>
<path
android:name="house"
@@ -40,6 +33,4 @@
android:strokeWidth="60" />
</group>
<animation android:sequence="arrow,house" />
</vector>