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

Merge "Change ripple tint to color, remove tintMode" into lmp-preview-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-06-10 20:14:30 +00:00
committed by Android (Google) Code Review
parent 598622df8c a4eab42fe4
commit eb29d330c3
18 changed files with 404 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

526
api/current.txt
View File

@@ -245,7 +245,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 = 16843828; // 0x1010434
field public static final int actionBarTheme = 16843827; // 0x1010433
field public static final int actionBarWidgetTheme = 16843671; // 0x1010397
field public static final int actionButtonStyle = 16843480; // 0x10102d8
field public static final int actionDropDownStyle = 16843479; // 0x10102d7
@@ -262,7 +262,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 = 16843847; // 0x1010447
field public static final int actionOverflowMenuStyle = 16843846; // 0x1010446
field public static final int actionProviderClass = 16843657; // 0x1010389
field public static final int actionViewClass = 16843516; // 0x10102fc
field public static final int activatedBackgroundIndicator = 16843517; // 0x10102fd
@@ -308,7 +308,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 = 16843850; // 0x101044a
field public static final int autoRemoveFromRecents = 16843849; // 0x1010449
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
@@ -381,22 +381,22 @@ package android {
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 = 16843832; // 0x1010438
field public static final int colorAccent = 16843831; // 0x1010437
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 = 16843822; // 0x101042e
field public static final int colorControlActivated = 16843821; // 0x101042d
field public static final int colorControlHighlight = 16843823; // 0x101042f
field public static final int colorControlNormal = 16843820; // 0x101042c
field public static final int colorButtonNormal = 16843821; // 0x101042d
field public static final int colorControlActivated = 16843820; // 0x101042c
field public static final int colorControlHighlight = 16843822; // 0x101042e
field public static final int colorControlNormal = 16843819; // 0x101042b
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 = 16843830; // 0x1010436
field public static final int colorPrimaryDark = 16843831; // 0x1010437
field public static final int colorPrimary = 16843829; // 0x1010435
field public static final int colorPrimaryDark = 16843830; // 0x1010436
field public static final int columnCount = 16843639; // 0x1010377
field public static final int columnDelay = 16843215; // 0x10101cf
field public static final int columnOrderPreserved = 16843640; // 0x1010378
@@ -411,10 +411,10 @@ package android {
field public static final int content = 16843355; // 0x101025b
field public static final int contentAuthority = 16843408; // 0x1010290
field public static final int contentDescription = 16843379; // 0x1010273
field public static final int contentInsetEnd = 16843863; // 0x1010457
field public static final int contentInsetLeft = 16843864; // 0x1010458
field public static final int contentInsetRight = 16843865; // 0x1010459
field public static final int contentInsetStart = 16843862; // 0x1010456
field public static final int contentInsetEnd = 16843862; // 0x1010456
field public static final int contentInsetLeft = 16843863; // 0x1010457
field public static final int contentInsetRight = 16843864; // 0x1010458
field public static final int contentInsetStart = 16843861; // 0x1010455
field public static final int controlX1 = 16843798; // 0x1010416
field public static final int controlX2 = 16843800; // 0x1010418
field public static final int controlY1 = 16843799; // 0x1010417
@@ -459,7 +459,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 = 16843848; // 0x1010448
field public static final int documentLaunchMode = 16843847; // 0x1010447
field public static final int drawSelectorOnTop = 16843004; // 0x10100fc
field public static final int drawable = 16843161; // 0x1010199
field public static final int drawableBottom = 16843118; // 0x101016e
@@ -488,8 +488,8 @@ package android {
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 elegantTextHeight = 16843868; // 0x101045c
field public static final int elevation = 16843843; // 0x1010443
field public static final int elegantTextHeight = 16843867; // 0x101045b
field public static final int elevation = 16843842; // 0x1010442
field public static final int ellipsize = 16842923; // 0x10100ab
field public static final int ems = 16843096; // 0x1010158
field public static final int enabled = 16842766; // 0x101000e
@@ -499,10 +499,10 @@ 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 = 16843845; // 0x1010445
field public static final int excludeClass = 16843844; // 0x1010444
field public static final int excludeFromRecents = 16842775; // 0x1010017
field public static final int excludeId = 16843844; // 0x1010444
field public static final int excludeViewName = 16843857; // 0x1010451
field public static final int excludeId = 16843843; // 0x1010443
field public static final int excludeViewName = 16843856; // 0x1010450
field public static final int exitFadeDuration = 16843533; // 0x101030d
field public static final int expandableListPreferredChildIndicatorLeft = 16842834; // 0x1010052
field public static final int expandableListPreferredChildIndicatorRight = 16842835; // 0x1010053
@@ -564,7 +564,7 @@ package android {
field public static final int freezesText = 16843116; // 0x101016c
field public static final int fromAlpha = 16843210; // 0x10101ca
field public static final int fromDegrees = 16843187; // 0x10101b3
field public static final int fromId = 16843853; // 0x101044d
field public static final int fromId = 16843852; // 0x101044c
field public static final int fromScene = 16843741; // 0x10103dd
field public static final int fromXDelta = 16843206; // 0x10101c6
field public static final int fromXScale = 16843202; // 0x10101c2
@@ -597,7 +597,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 = 16843846; // 0x1010446
field public static final int hideOnContentScroll = 16843845; // 0x1010445
field public static final int hint = 16843088; // 0x1010150
field public static final int homeAsUpIndicator = 16843531; // 0x101030b
field public static final int homeLayout = 16843549; // 0x101031d
@@ -792,7 +792,7 @@ package android {
field public static final int manageSpaceActivity = 16842756; // 0x1010004
field public static final int mapViewStyle = 16842890; // 0x101008a
field public static final int marqueeRepeatLimit = 16843293; // 0x101021d
field public static final int matchOrder = 16843858; // 0x1010452
field public static final int matchOrder = 16843857; // 0x1010451
field public static final int max = 16843062; // 0x1010136
field public static final int maxDate = 16843584; // 0x1010340
field public static final int maxEms = 16843095; // 0x1010157
@@ -801,7 +801,7 @@ package android {
field public static final int maxLength = 16843104; // 0x1010160
field public static final int maxLevel = 16843186; // 0x10101b2
field public static final int maxLines = 16843091; // 0x1010153
field public static final int maxRecents = 16843849; // 0x1010449
field public static final int maxRecents = 16843848; // 0x1010448
field public static final int maxRows = 16843059; // 0x1010133
field public static final int maxSdkVersion = 16843377; // 0x1010271
field public static final int maxWidth = 16843039; // 0x101011f
@@ -826,10 +826,10 @@ package android {
field public static final int moreIcon = 16843061; // 0x1010135
field public static final int multiprocess = 16842771; // 0x1010013
field public static final int name = 16842755; // 0x1010003
field public static final int navigationBarColor = 16843861; // 0x1010455
field public static final int navigationBarColor = 16843860; // 0x1010454
field public static final int navigationMode = 16843471; // 0x10102cf
field public static final int negativeButtonText = 16843254; // 0x10101f6
field public static final int nestedScrollingEnabled = 16843833; // 0x1010439
field public static final int nestedScrollingEnabled = 16843832; // 0x1010438
field public static final int nextFocusDown = 16842980; // 0x10100e4
field public static final int nextFocusForward = 16843580; // 0x101033c
field public static final int nextFocusLeft = 16842977; // 0x10100e1
@@ -860,7 +860,7 @@ package android {
field public static final int paddingBottom = 16842969; // 0x10100d9
field public static final int paddingEnd = 16843700; // 0x10103b4
field public static final int paddingLeft = 16842966; // 0x10100d6
field public static final int paddingMode = 16843866; // 0x101045a
field public static final int paddingMode = 16843865; // 0x1010459
field public static final int paddingRight = 16842968; // 0x10100d8
field public static final int paddingStart = 16843699; // 0x10103b3
field public static final int paddingTop = 16842967; // 0x10100d7
@@ -879,11 +879,10 @@ package android {
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 = 16843824; // 0x1010430
field public static final int persistable = 16843823; // 0x101042f
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 = 16843819; // 0x101042b
field public static final int pivotX = 16843189; // 0x10101b5
field public static final int pivotY = 16843190; // 0x10101b6
field public static final int popupAnimationStyle = 16843465; // 0x10102c9
@@ -956,7 +955,7 @@ package android {
field public static final int restoreAnyVersion = 16843450; // 0x10102ba
field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d
field public static final int restrictedAccountType = 16843733; // 0x10103d5
field public static final int reversible = 16843854; // 0x101044e
field public static final int reversible = 16843853; // 0x101044d
field public static final int right = 16843183; // 0x10101af
field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093
field public static final int ringtoneType = 16843257; // 0x10101f9
@@ -1010,10 +1009,10 @@ package android {
field public static final int selectAllOnFocus = 16843102; // 0x101015e
field public static final int selectable = 16843238; // 0x10101e6
field public static final int selectableItemBackground = 16843534; // 0x101030e
field public static final int selectableItemBackgroundBorderless = 16843867; // 0x101045b
field public static final int selectableItemBackgroundBorderless = 16843866; // 0x101045a
field public static final int selectedDateVerticalBar = 16843591; // 0x1010347
field public static final int selectedWeekBackgroundColor = 16843586; // 0x1010342
field public static final int sessionService = 16843840; // 0x1010440
field public static final int sessionService = 16843839; // 0x101043f
field public static final int settingsActivity = 16843301; // 0x1010225
field public static final int setupActivity = 16843766; // 0x10103f6
field public static final int shadowColor = 16843105; // 0x1010161
@@ -1035,7 +1034,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 = 16843827; // 0x1010433
field public static final int slideEdge = 16843826; // 0x1010432
field public static final int smallIcon = 16843422; // 0x101029e
field public static final int smallScreens = 16843396; // 0x1010284
field public static final int smoothScrollbar = 16843313; // 0x1010231
@@ -1047,19 +1046,19 @@ package android {
field public static final int spinnerStyle = 16842881; // 0x1010081
field public static final int spinnersShown = 16843595; // 0x101034b
field public static final int splitMotionEvents = 16843503; // 0x10102ef
field public static final int splitTrack = 16843855; // 0x101044f
field public static final int splitTrack = 16843854; // 0x101044e
field public static final int src = 16843033; // 0x1010119
field public static final int ssp = 16843747; // 0x10103e3
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 = 16843841; // 0x1010441
field public static final int stackViewStyle = 16843840; // 0x1010440
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 = 16843851; // 0x101044b
field public static final int stateListAnimator = 16843850; // 0x101044a
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
@@ -1084,7 +1083,7 @@ package android {
field public static final int state_single = 16842915; // 0x10100a3
field public static final int state_window_focused = 16842909; // 0x101009d
field public static final int staticWallpaperPreview = 16843569; // 0x1010331
field public static final int statusBarColor = 16843860; // 0x1010454
field public static final int statusBarColor = 16843859; // 0x1010453
field public static final int stepSize = 16843078; // 0x1010146
field public static final int stopWithTask = 16843626; // 0x101036a
field public static final int streamType = 16843273; // 0x1010209
@@ -1096,7 +1095,7 @@ package android {
field public static final int strokeOpacity = 16843810; // 0x1010422
field public static final int strokeWidth = 16843811; // 0x1010423
field public static final int subtitle = 16843473; // 0x10102d1
field public static final int subtitleTextAppearance = 16843826; // 0x1010432
field public static final int subtitleTextAppearance = 16843825; // 0x1010431
field public static final int subtitleTextStyle = 16843513; // 0x10102f9
field public static final int subtypeExtraValue = 16843674; // 0x101039a
field public static final int subtypeId = 16843713; // 0x10103c1
@@ -1113,7 +1112,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 = 16843842; // 0x1010442
field public static final int switchStyle = 16843841; // 0x1010441
field public static final int switchTextAppearance = 16843630; // 0x101036e
field public static final int switchTextOff = 16843628; // 0x101036c
field public static final int switchTextOn = 16843627; // 0x101036b
@@ -1129,7 +1128,7 @@ package android {
field public static final int targetId = 16843740; // 0x10103dc
field public static final int targetPackage = 16842785; // 0x1010021
field public static final int targetSdkVersion = 16843376; // 0x1010270
field public static final int targetViewName = 16843856; // 0x1010450
field public static final int targetViewName = 16843855; // 0x101044f
field public static final int taskAffinity = 16842770; // 0x1010012
field public static final int taskCloseEnterAnimation = 16842942; // 0x10100be
field public static final int taskCloseExitAnimation = 16842943; // 0x10100bf
@@ -1151,7 +1150,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 = 16843829; // 0x1010435
field public static final int textAppearanceListItemSecondary = 16843828; // 0x1010434
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,11 +1214,11 @@ package android {
field public static final int tintMode = 16843797; // 0x1010415
field public static final int title = 16843233; // 0x10101e1
field public static final int titleCondensed = 16843234; // 0x10101e2
field public static final int titleTextAppearance = 16843825; // 0x1010431
field public static final int titleTextAppearance = 16843824; // 0x1010430
field public static final int titleTextStyle = 16843512; // 0x10102f8
field public static final int toAlpha = 16843211; // 0x10101cb
field public static final int toDegrees = 16843188; // 0x10101b4
field public static final int toId = 16843852; // 0x101044c
field public static final int toId = 16843851; // 0x101044b
field public static final int toScene = 16843742; // 0x10103de
field public static final int toXDelta = 16843207; // 0x10101c7
field public static final int toXScale = 16843203; // 0x10101c3
@@ -1300,8 +1299,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 = 16843839; // 0x101043f
field public static final int windowAllowExitTransitionOverlap = 16843838; // 0x101043e
field public static final int windowAllowEnterTransitionOverlap = 16843838; // 0x101043e
field public static final int windowAllowExitTransitionOverlap = 16843837; // 0x101043d
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,12 +1308,12 @@ package android {
field public static final int windowContentTransitionManager = 16843795; // 0x1010413
field public static final int windowContentTransitions = 16843794; // 0x1010412
field public static final int windowDisablePreview = 16843298; // 0x1010222
field public static final int windowDrawsSystemBarBackgrounds = 16843859; // 0x1010453
field public static final int windowDrawsSystemBarBackgrounds = 16843858; // 0x1010452
field public static final int windowEnableSplitTouch = 16843543; // 0x1010317
field public static final int windowEnterAnimation = 16842932; // 0x10100b4
field public static final int windowEnterTransition = 16843834; // 0x101043a
field public static final int windowEnterTransition = 16843833; // 0x1010439
field public static final int windowExitAnimation = 16842933; // 0x10100b5
field public static final int windowExitTransition = 16843835; // 0x101043b
field public static final int windowExitTransition = 16843834; // 0x101043a
field public static final int windowFrame = 16842837; // 0x1010055
field public static final int windowFullscreen = 16843277; // 0x101020d
field public static final int windowHideAnimation = 16842935; // 0x10100b7
@@ -1325,8 +1324,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 = 16843836; // 0x101043c
field public static final int windowSharedElementExitTransition = 16843837; // 0x101043d
field public static final int windowSharedElementEnterTransition = 16843835; // 0x101043b
field public static final int windowSharedElementExitTransition = 16843836; // 0x101043c
field public static final int windowShowAnimation = 16842934; // 0x10100b6
field public static final int windowShowWallpaper = 16843410; // 0x1010292
field public static final int windowSoftInputMode = 16843307; // 0x101022b
@@ -1858,52 +1857,52 @@ package android {
field public static final int TextAppearance_Inverse = 16973887; // 0x103003f
field public static final int TextAppearance_Large = 16973890; // 0x1030042
field public static final int TextAppearance_Large_Inverse = 16973891; // 0x1030043
field public static final int TextAppearance_Material = 16974348; // 0x103020c
field public static final int TextAppearance_Material_Body1 = 16974546; // 0x10302d2
field public static final int TextAppearance_Material_Body2 = 16974545; // 0x10302d1
field public static final int TextAppearance_Material_Button = 16974549; // 0x10302d5
field public static final int TextAppearance_Material_Caption = 16974547; // 0x10302d3
field public static final int TextAppearance_Material_DialogWindowTitle = 16974349; // 0x103020d
field public static final int TextAppearance_Material_Display1 = 16974541; // 0x10302cd
field public static final int TextAppearance_Material_Display2 = 16974540; // 0x10302cc
field public static final int TextAppearance_Material_Display3 = 16974539; // 0x10302cb
field public static final int TextAppearance_Material_Display4 = 16974538; // 0x10302ca
field public static final int TextAppearance_Material_Headline = 16974542; // 0x10302ce
field public static final int TextAppearance_Material_Inverse = 16974350; // 0x103020e
field public static final int TextAppearance_Material_Large = 16974351; // 0x103020f
field public static final int TextAppearance_Material_Large_Inverse = 16974352; // 0x1030210
field public static final int TextAppearance_Material_Medium = 16974353; // 0x1030211
field public static final int TextAppearance_Material_Medium_Inverse = 16974354; // 0x1030212
field public static final int TextAppearance_Material_Menu = 16974548; // 0x10302d4
field public static final int TextAppearance_Material_SearchResult_Subtitle = 16974355; // 0x1030213
field public static final int TextAppearance_Material_SearchResult_Title = 16974356; // 0x1030214
field public static final int TextAppearance_Material_Small = 16974357; // 0x1030215
field public static final int TextAppearance_Material_Small_Inverse = 16974358; // 0x1030216
field public static final int TextAppearance_Material_Subhead = 16974544; // 0x10302d0
field public static final int TextAppearance_Material_Title = 16974543; // 0x10302cf
field public static final int TextAppearance_Material_Widget = 16974360; // 0x1030218
field public static final int TextAppearance_Material_Widget_ActionBar_Menu = 16974361; // 0x1030219
field public static final int TextAppearance_Material_Widget_ActionBar_Subtitle = 16974362; // 0x103021a
field public static final int TextAppearance_Material_Widget_ActionBar_Subtitle_Inverse = 16974363; // 0x103021b
field public static final int TextAppearance_Material_Widget_ActionBar_Title = 16974364; // 0x103021c
field public static final int TextAppearance_Material_Widget_ActionBar_Title_Inverse = 16974365; // 0x103021d
field public static final int TextAppearance_Material_Widget_ActionMode_Subtitle = 16974366; // 0x103021e
field public static final int TextAppearance_Material_Widget_ActionMode_Subtitle_Inverse = 16974367; // 0x103021f
field public static final int TextAppearance_Material_Widget_ActionMode_Title = 16974368; // 0x1030220
field public static final int TextAppearance_Material_Widget_ActionMode_Title_Inverse = 16974369; // 0x1030221
field public static final int TextAppearance_Material_Widget_Button = 16974370; // 0x1030222
field public static final int TextAppearance_Material_Widget_DropDownHint = 16974371; // 0x1030223
field public static final int TextAppearance_Material_Widget_DropDownItem = 16974372; // 0x1030224
field public static final int TextAppearance_Material_Widget_EditText = 16974373; // 0x1030225
field public static final int TextAppearance_Material_Widget_IconMenu_Item = 16974374; // 0x1030226
field public static final int TextAppearance_Material_Widget_PopupMenu = 16974375; // 0x1030227
field public static final int TextAppearance_Material_Widget_PopupMenu_Large = 16974376; // 0x1030228
field public static final int TextAppearance_Material_Widget_PopupMenu_Small = 16974377; // 0x1030229
field public static final int TextAppearance_Material_Widget_TabWidget = 16974378; // 0x103022a
field public static final int TextAppearance_Material_Widget_TextView = 16974379; // 0x103022b
field public static final int TextAppearance_Material_Widget_TextView_PopupMenu = 16974380; // 0x103022c
field public static final int TextAppearance_Material_Widget_TextView_SpinnerItem = 16974381; // 0x103022d
field public static final int TextAppearance_Material_WindowTitle = 16974359; // 0x1030217
field public static final int TextAppearance_Material = 16974350; // 0x103020e
field public static final int TextAppearance_Material_Body1 = 16974550; // 0x10302d6
field public static final int TextAppearance_Material_Body2 = 16974549; // 0x10302d5
field public static final int TextAppearance_Material_Button = 16974553; // 0x10302d9
field public static final int TextAppearance_Material_Caption = 16974551; // 0x10302d7
field public static final int TextAppearance_Material_DialogWindowTitle = 16974351; // 0x103020f
field public static final int TextAppearance_Material_Display1 = 16974545; // 0x10302d1
field public static final int TextAppearance_Material_Display2 = 16974544; // 0x10302d0
field public static final int TextAppearance_Material_Display3 = 16974543; // 0x10302cf
field public static final int TextAppearance_Material_Display4 = 16974542; // 0x10302ce
field public static final int TextAppearance_Material_Headline = 16974546; // 0x10302d2
field public static final int TextAppearance_Material_Inverse = 16974352; // 0x1030210
field public static final int TextAppearance_Material_Large = 16974353; // 0x1030211
field public static final int TextAppearance_Material_Large_Inverse = 16974354; // 0x1030212
field public static final int TextAppearance_Material_Medium = 16974355; // 0x1030213
field public static final int TextAppearance_Material_Medium_Inverse = 16974356; // 0x1030214
field public static final int TextAppearance_Material_Menu = 16974552; // 0x10302d8
field public static final int TextAppearance_Material_SearchResult_Subtitle = 16974357; // 0x1030215
field public static final int TextAppearance_Material_SearchResult_Title = 16974358; // 0x1030216
field public static final int TextAppearance_Material_Small = 16974359; // 0x1030217
field public static final int TextAppearance_Material_Small_Inverse = 16974360; // 0x1030218
field public static final int TextAppearance_Material_Subhead = 16974548; // 0x10302d4
field public static final int TextAppearance_Material_Title = 16974547; // 0x10302d3
field public static final int TextAppearance_Material_Widget = 16974362; // 0x103021a
field public static final int TextAppearance_Material_Widget_ActionBar_Menu = 16974363; // 0x103021b
field public static final int TextAppearance_Material_Widget_ActionBar_Subtitle = 16974364; // 0x103021c
field public static final int TextAppearance_Material_Widget_ActionBar_Subtitle_Inverse = 16974365; // 0x103021d
field public static final int TextAppearance_Material_Widget_ActionBar_Title = 16974366; // 0x103021e
field public static final int TextAppearance_Material_Widget_ActionBar_Title_Inverse = 16974367; // 0x103021f
field public static final int TextAppearance_Material_Widget_ActionMode_Subtitle = 16974368; // 0x1030220
field public static final int TextAppearance_Material_Widget_ActionMode_Subtitle_Inverse = 16974369; // 0x1030221
field public static final int TextAppearance_Material_Widget_ActionMode_Title = 16974370; // 0x1030222
field public static final int TextAppearance_Material_Widget_ActionMode_Title_Inverse = 16974371; // 0x1030223
field public static final int TextAppearance_Material_Widget_Button = 16974372; // 0x1030224
field public static final int TextAppearance_Material_Widget_DropDownHint = 16974373; // 0x1030225
field public static final int TextAppearance_Material_Widget_DropDownItem = 16974374; // 0x1030226
field public static final int TextAppearance_Material_Widget_EditText = 16974375; // 0x1030227
field public static final int TextAppearance_Material_Widget_IconMenu_Item = 16974376; // 0x1030228
field public static final int TextAppearance_Material_Widget_PopupMenu = 16974377; // 0x1030229
field public static final int TextAppearance_Material_Widget_PopupMenu_Large = 16974378; // 0x103022a
field public static final int TextAppearance_Material_Widget_PopupMenu_Small = 16974379; // 0x103022b
field public static final int TextAppearance_Material_Widget_TabWidget = 16974380; // 0x103022c
field public static final int TextAppearance_Material_Widget_TextView = 16974381; // 0x103022d
field public static final int TextAppearance_Material_Widget_TextView_PopupMenu = 16974382; // 0x103022e
field public static final int TextAppearance_Material_Widget_TextView_SpinnerItem = 16974383; // 0x103022f
field public static final int TextAppearance_Material_WindowTitle = 16974361; // 0x1030219
field public static final int TextAppearance_Medium = 16973892; // 0x1030044
field public static final int TextAppearance_Medium_Inverse = 16973893; // 0x1030045
field public static final int TextAppearance_Small = 16973894; // 0x1030046
@@ -1929,12 +1928,12 @@ package android {
field public static final int TextAppearance_Widget_TextView_SpinnerItem = 16973906; // 0x1030052
field public static final int TextAppearance_WindowTitle = 16973907; // 0x1030053
field public static final int Theme = 16973829; // 0x1030005
field public static final int ThemeOverlay = 16974412; // 0x103024c
field public static final int ThemeOverlay_Material = 16974413; // 0x103024d
field public static final int ThemeOverlay_Material_ActionBar = 16974414; // 0x103024e
field public static final int ThemeOverlay_Material_Dark = 16974416; // 0x1030250
field public static final int ThemeOverlay_Material_Dark_ActionBar = 16974417; // 0x1030251
field public static final int ThemeOverlay_Material_Light = 16974415; // 0x103024f
field public static final int ThemeOverlay = 16974414; // 0x103024e
field public static final int ThemeOverlay_Material = 16974415; // 0x103024f
field public static final int ThemeOverlay_Material_ActionBar = 16974416; // 0x1030250
field public static final int ThemeOverlay_Material_Dark = 16974418; // 0x1030252
field public static final int ThemeOverlay_Material_Dark_ActionBar = 16974419; // 0x1030253
field public static final int ThemeOverlay_Material_Light = 16974417; // 0x1030251
field public static final int Theme_Black = 16973832; // 0x1030008
field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009
field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a
@@ -2001,36 +2000,36 @@ package android {
field public static final int Theme_Light_NoTitleBar_Fullscreen = 16973838; // 0x103000e
field public static final int Theme_Light_Panel = 16973914; // 0x103005a
field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062
field public static final int Theme_Material = 16974382; // 0x103022e
field public static final int Theme_Material_Dialog = 16974383; // 0x103022f
field public static final int Theme_Material_DialogWhenLarge = 16974387; // 0x1030233
field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974388; // 0x1030234
field public static final int Theme_Material_Dialog_MinWidth = 16974384; // 0x1030230
field public static final int Theme_Material_Dialog_NoActionBar = 16974385; // 0x1030231
field public static final int Theme_Material_Dialog_NoActionBar_MinWidth = 16974386; // 0x1030232
field public static final int Theme_Material_InputMethod = 16974389; // 0x1030235
field public static final int Theme_Material_Light = 16974398; // 0x103023e
field public static final int Theme_Material_Light_DarkActionBar = 16974399; // 0x103023f
field public static final int Theme_Material_Light_Dialog = 16974400; // 0x1030240
field public static final int Theme_Material_Light_DialogWhenLarge = 16974404; // 0x1030244
field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974405; // 0x1030245
field public static final int Theme_Material_Light_Dialog_MinWidth = 16974401; // 0x1030241
field public static final int Theme_Material_Light_Dialog_NoActionBar = 16974402; // 0x1030242
field public static final int Theme_Material_Light_Dialog_NoActionBar_MinWidth = 16974403; // 0x1030243
field public static final int Theme_Material_Light_NoActionBar = 16974406; // 0x1030246
field public static final int Theme_Material_Light_NoActionBar_Fullscreen = 16974407; // 0x1030247
field public static final int Theme_Material_Light_NoActionBar_Overscan = 16974408; // 0x1030248
field public static final int Theme_Material_Light_NoActionBar_TranslucentDecor = 16974409; // 0x1030249
field public static final int Theme_Material_Light_Panel = 16974410; // 0x103024a
field public static final int Theme_Material_Light_Voice = 16974411; // 0x103024b
field public static final int Theme_Material_NoActionBar = 16974390; // 0x1030236
field public static final int Theme_Material_NoActionBar_Fullscreen = 16974391; // 0x1030237
field public static final int Theme_Material_NoActionBar_Overscan = 16974392; // 0x1030238
field public static final int Theme_Material_NoActionBar_TranslucentDecor = 16974393; // 0x1030239
field public static final int Theme_Material_Panel = 16974394; // 0x103023a
field public static final int Theme_Material_Voice = 16974395; // 0x103023b
field public static final int Theme_Material_Wallpaper = 16974396; // 0x103023c
field public static final int Theme_Material_Wallpaper_NoTitleBar = 16974397; // 0x103023d
field public static final int Theme_Material = 16974384; // 0x1030230
field public static final int Theme_Material_Dialog = 16974385; // 0x1030231
field public static final int Theme_Material_DialogWhenLarge = 16974389; // 0x1030235
field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974390; // 0x1030236
field public static final int Theme_Material_Dialog_MinWidth = 16974386; // 0x1030232
field public static final int Theme_Material_Dialog_NoActionBar = 16974387; // 0x1030233
field public static final int Theme_Material_Dialog_NoActionBar_MinWidth = 16974388; // 0x1030234
field public static final int Theme_Material_InputMethod = 16974391; // 0x1030237
field public static final int Theme_Material_Light = 16974400; // 0x1030240
field public static final int Theme_Material_Light_DarkActionBar = 16974401; // 0x1030241
field public static final int Theme_Material_Light_Dialog = 16974402; // 0x1030242
field public static final int Theme_Material_Light_DialogWhenLarge = 16974406; // 0x1030246
field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974407; // 0x1030247
field public static final int Theme_Material_Light_Dialog_MinWidth = 16974403; // 0x1030243
field public static final int Theme_Material_Light_Dialog_NoActionBar = 16974404; // 0x1030244
field public static final int Theme_Material_Light_Dialog_NoActionBar_MinWidth = 16974405; // 0x1030245
field public static final int Theme_Material_Light_NoActionBar = 16974408; // 0x1030248
field public static final int Theme_Material_Light_NoActionBar_Fullscreen = 16974409; // 0x1030249
field public static final int Theme_Material_Light_NoActionBar_Overscan = 16974410; // 0x103024a
field public static final int Theme_Material_Light_NoActionBar_TranslucentDecor = 16974411; // 0x103024b
field public static final int Theme_Material_Light_Panel = 16974412; // 0x103024c
field public static final int Theme_Material_Light_Voice = 16974413; // 0x103024d
field public static final int Theme_Material_NoActionBar = 16974392; // 0x1030238
field public static final int Theme_Material_NoActionBar_Fullscreen = 16974393; // 0x1030239
field public static final int Theme_Material_NoActionBar_Overscan = 16974394; // 0x103023a
field public static final int Theme_Material_NoActionBar_TranslucentDecor = 16974395; // 0x103023b
field public static final int Theme_Material_Panel = 16974396; // 0x103023c
field public static final int Theme_Material_Voice = 16974397; // 0x103023d
field public static final int Theme_Material_Wallpaper = 16974398; // 0x103023e
field public static final int Theme_Material_Wallpaper_NoTitleBar = 16974399; // 0x103023f
field public static final int Theme_NoDisplay = 16973909; // 0x1030055
field public static final int Theme_NoTitleBar = 16973830; // 0x1030006
field public static final int Theme_NoTitleBar_Fullscreen = 16973831; // 0x1030007
@@ -2092,7 +2091,7 @@ package android {
field public static final int Widget_DeviceDefault_DropDownItem_Spinner = 16974178; // 0x1030162
field public static final int Widget_DeviceDefault_EditText = 16974154; // 0x103014a
field public static final int Widget_DeviceDefault_ExpandableListView = 16974155; // 0x103014b
field public static final int Widget_DeviceDefault_FastScroll = 16974344; // 0x1030208
field public static final int Widget_DeviceDefault_FastScroll = 16974346; // 0x103020a
field public static final int Widget_DeviceDefault_GridView = 16974156; // 0x103014c
field public static final int Widget_DeviceDefault_HorizontalScrollView = 16974171; // 0x103015b
field public static final int Widget_DeviceDefault_ImageButton = 16974157; // 0x103014d
@@ -2126,7 +2125,7 @@ package android {
field public static final int Widget_DeviceDefault_Light_DropDownItem_Spinner = 16974233; // 0x1030199
field public static final int Widget_DeviceDefault_Light_EditText = 16974206; // 0x103017e
field public static final int Widget_DeviceDefault_Light_ExpandableListView = 16974207; // 0x103017f
field public static final int Widget_DeviceDefault_Light_FastScroll = 16974346; // 0x103020a
field public static final int Widget_DeviceDefault_Light_FastScroll = 16974348; // 0x103020c
field public static final int Widget_DeviceDefault_Light_GridView = 16974208; // 0x1030180
field public static final int Widget_DeviceDefault_Light_HorizontalScrollView = 16974226; // 0x1030192
field public static final int Widget_DeviceDefault_Light_ImageButton = 16974209; // 0x1030181
@@ -2150,7 +2149,7 @@ package android {
field public static final int Widget_DeviceDefault_Light_ScrollView = 16974225; // 0x1030191
field public static final int Widget_DeviceDefault_Light_SeekBar = 16974220; // 0x103018c
field public static final int Widget_DeviceDefault_Light_Spinner = 16974227; // 0x1030193
field public static final int Widget_DeviceDefault_Light_StackView = 16974347; // 0x103020b
field public static final int Widget_DeviceDefault_Light_StackView = 16974349; // 0x103020d
field public static final int Widget_DeviceDefault_Light_Tab = 16974237; // 0x103019d
field public static final int Widget_DeviceDefault_Light_TabWidget = 16974229; // 0x1030195
field public static final int Widget_DeviceDefault_Light_TextView = 16974202; // 0x103017a
@@ -2174,7 +2173,7 @@ package android {
field public static final int Widget_DeviceDefault_ScrollView = 16974170; // 0x103015a
field public static final int Widget_DeviceDefault_SeekBar = 16974165; // 0x1030155
field public static final int Widget_DeviceDefault_Spinner = 16974172; // 0x103015c
field public static final int Widget_DeviceDefault_StackView = 16974345; // 0x1030209
field public static final int Widget_DeviceDefault_StackView = 16974347; // 0x103020b
field public static final int Widget_DeviceDefault_Tab = 16974189; // 0x103016d
field public static final int Widget_DeviceDefault_TabWidget = 16974174; // 0x103015e
field public static final int Widget_DeviceDefault_TextView = 16974150; // 0x1030146
@@ -2217,7 +2216,7 @@ package android {
field public static final int Widget_Holo_DropDownItem_Spinner = 16973995; // 0x10300ab
field public static final int Widget_Holo_EditText = 16973971; // 0x1030093
field public static final int Widget_Holo_ExpandableListView = 16973972; // 0x1030094
field public static final int Widget_Holo_FastScroll = 16974339; // 0x1030203
field public static final int Widget_Holo_FastScroll = 16974341; // 0x1030205
field public static final int Widget_Holo_GridView = 16973973; // 0x1030095
field public static final int Widget_Holo_HorizontalScrollView = 16973988; // 0x10300a4
field public static final int Widget_Holo_ImageButton = 16973974; // 0x1030096
@@ -2238,7 +2237,7 @@ package android {
field public static final int Widget_Holo_Light_ActionMode_Inverse = 16974119; // 0x1030127
field public static final int Widget_Holo_Light_AutoCompleteTextView = 16974011; // 0x10300bb
field public static final int Widget_Holo_Light_Button = 16974006; // 0x10300b6
field public static final int Widget_Holo_Light_Button_Borderless = 16974341; // 0x1030205
field public static final int Widget_Holo_Light_Button_Borderless = 16974343; // 0x1030207
field public static final int Widget_Holo_Light_Button_Borderless_Small = 16974107; // 0x103011b
field public static final int Widget_Holo_Light_Button_Inset = 16974008; // 0x10300b8
field public static final int Widget_Holo_Light_Button_Small = 16974007; // 0x10300b7
@@ -2252,7 +2251,7 @@ package android {
field public static final int Widget_Holo_Light_DropDownItem_Spinner = 16974041; // 0x10300d9
field public static final int Widget_Holo_Light_EditText = 16974014; // 0x10300be
field public static final int Widget_Holo_Light_ExpandableListView = 16974015; // 0x10300bf
field public static final int Widget_Holo_Light_FastScroll = 16974342; // 0x1030206
field public static final int Widget_Holo_Light_FastScroll = 16974344; // 0x1030208
field public static final int Widget_Holo_Light_GridView = 16974016; // 0x10300c0
field public static final int Widget_Holo_Light_HorizontalScrollView = 16974034; // 0x10300d2
field public static final int Widget_Holo_Light_ImageButton = 16974017; // 0x10300c1
@@ -2276,7 +2275,7 @@ package android {
field public static final int Widget_Holo_Light_ScrollView = 16974033; // 0x10300d1
field public static final int Widget_Holo_Light_SeekBar = 16974028; // 0x10300cc
field public static final int Widget_Holo_Light_Spinner = 16974035; // 0x10300d3
field public static final int Widget_Holo_Light_StackView = 16974343; // 0x1030207
field public static final int Widget_Holo_Light_StackView = 16974345; // 0x1030209
field public static final int Widget_Holo_Light_Tab = 16974052; // 0x10300e4
field public static final int Widget_Holo_Light_TabWidget = 16974037; // 0x10300d5
field public static final int Widget_Holo_Light_TextView = 16974010; // 0x10300ba
@@ -2300,7 +2299,7 @@ package android {
field public static final int Widget_Holo_ScrollView = 16973987; // 0x10300a3
field public static final int Widget_Holo_SeekBar = 16973982; // 0x103009e
field public static final int Widget_Holo_Spinner = 16973989; // 0x10300a5
field public static final int Widget_Holo_StackView = 16974340; // 0x1030204
field public static final int Widget_Holo_StackView = 16974342; // 0x1030206
field public static final int Widget_Holo_Tab = 16974051; // 0x10300e3
field public static final int Widget_Holo_TabWidget = 16973991; // 0x10300a7
field public static final int Widget_Holo_TextView = 16973967; // 0x103008f
@@ -2315,126 +2314,128 @@ package android {
field public static final int Widget_ListView_DropDown = 16973872; // 0x1030030
field public static final int Widget_ListView_Menu = 16973873; // 0x1030031
field public static final int Widget_ListView_White = 16973871; // 0x103002f
field public static final int Widget_Material = 16974418; // 0x1030252
field public static final int Widget_Material_ActionBar = 16974419; // 0x1030253
field public static final int Widget_Material_ActionBar_Solid = 16974420; // 0x1030254
field public static final int Widget_Material_ActionBar_TabBar = 16974421; // 0x1030255
field public static final int Widget_Material_ActionBar_TabText = 16974422; // 0x1030256
field public static final int Widget_Material_ActionBar_TabView = 16974423; // 0x1030257
field public static final int Widget_Material_ActionButton = 16974424; // 0x1030258
field public static final int Widget_Material_ActionButton_CloseMode = 16974425; // 0x1030259
field public static final int Widget_Material_ActionButton_Overflow = 16974426; // 0x103025a
field public static final int Widget_Material_ActionMode = 16974427; // 0x103025b
field public static final int Widget_Material_AutoCompleteTextView = 16974428; // 0x103025c
field public static final int Widget_Material_Button = 16974429; // 0x103025d
field public static final int Widget_Material_ButtonBar = 16974435; // 0x1030263
field public static final int Widget_Material_ButtonBar_AlertDialog = 16974436; // 0x1030264
field public static final int Widget_Material_Button_Borderless = 16974430; // 0x103025e
field public static final int Widget_Material_Button_Borderless_Small = 16974431; // 0x103025f
field public static final int Widget_Material_Button_Inset = 16974432; // 0x1030260
field public static final int Widget_Material_Button_Small = 16974433; // 0x1030261
field public static final int Widget_Material_Button_Toggle = 16974434; // 0x1030262
field public static final int Widget_Material_CalendarView = 16974437; // 0x1030265
field public static final int Widget_Material_CheckedTextView = 16974438; // 0x1030266
field public static final int Widget_Material_CompoundButton_CheckBox = 16974439; // 0x1030267
field public static final int Widget_Material_CompoundButton_RadioButton = 16974440; // 0x1030268
field public static final int Widget_Material_CompoundButton_Star = 16974441; // 0x1030269
field public static final int Widget_Material_DatePicker = 16974442; // 0x103026a
field public static final int Widget_Material_DropDownItem = 16974443; // 0x103026b
field public static final int Widget_Material_DropDownItem_Spinner = 16974444; // 0x103026c
field public static final int Widget_Material_EditText = 16974445; // 0x103026d
field public static final int Widget_Material_ExpandableListView = 16974446; // 0x103026e
field public static final int Widget_Material_FastScroll = 16974447; // 0x103026f
field public static final int Widget_Material_GridView = 16974448; // 0x1030270
field public static final int Widget_Material_HorizontalScrollView = 16974449; // 0x1030271
field public static final int Widget_Material_ImageButton = 16974450; // 0x1030272
field public static final int Widget_Material_Light = 16974477; // 0x103028d
field public static final int Widget_Material_Light_ActionBar = 16974478; // 0x103028e
field public static final int Widget_Material_Light_ActionBar_Solid = 16974479; // 0x103028f
field public static final int Widget_Material_Light_ActionBar_TabBar = 16974480; // 0x1030290
field public static final int Widget_Material_Light_ActionBar_TabText = 16974481; // 0x1030291
field public static final int Widget_Material_Light_ActionBar_TabView = 16974482; // 0x1030292
field public static final int Widget_Material_Light_ActionButton = 16974483; // 0x1030293
field public static final int Widget_Material_Light_ActionButton_CloseMode = 16974484; // 0x1030294
field public static final int Widget_Material_Light_ActionButton_Overflow = 16974485; // 0x1030295
field public static final int Widget_Material_Light_ActionMode = 16974486; // 0x1030296
field public static final int Widget_Material_Light_AutoCompleteTextView = 16974487; // 0x1030297
field public static final int Widget_Material_Light_Button = 16974488; // 0x1030298
field public static final int Widget_Material_Light_ButtonBar = 16974494; // 0x103029e
field public static final int Widget_Material_Light_ButtonBar_AlertDialog = 16974495; // 0x103029f
field public static final int Widget_Material_Light_Button_Borderless = 16974489; // 0x1030299
field public static final int Widget_Material_Light_Button_Borderless_Small = 16974490; // 0x103029a
field public static final int Widget_Material_Light_Button_Inset = 16974491; // 0x103029b
field public static final int Widget_Material_Light_Button_Small = 16974492; // 0x103029c
field public static final int Widget_Material_Light_Button_Toggle = 16974493; // 0x103029d
field public static final int Widget_Material_Light_CalendarView = 16974496; // 0x10302a0
field public static final int Widget_Material_Light_CheckedTextView = 16974497; // 0x10302a1
field public static final int Widget_Material_Light_CompoundButton_CheckBox = 16974498; // 0x10302a2
field public static final int Widget_Material_Light_CompoundButton_RadioButton = 16974499; // 0x10302a3
field public static final int Widget_Material_Light_CompoundButton_Star = 16974500; // 0x10302a4
field public static final int Widget_Material_Light_DropDownItem = 16974501; // 0x10302a5
field public static final int Widget_Material_Light_DropDownItem_Spinner = 16974502; // 0x10302a6
field public static final int Widget_Material_Light_EditText = 16974503; // 0x10302a7
field public static final int Widget_Material_Light_ExpandableListView = 16974504; // 0x10302a8
field public static final int Widget_Material_Light_FastScroll = 16974505; // 0x10302a9
field public static final int Widget_Material_Light_GridView = 16974506; // 0x10302aa
field public static final int Widget_Material_Light_HorizontalScrollView = 16974507; // 0x10302ab
field public static final int Widget_Material_Light_ImageButton = 16974508; // 0x10302ac
field public static final int Widget_Material_Light_ListPopupWindow = 16974509; // 0x10302ad
field public static final int Widget_Material_Light_ListView = 16974510; // 0x10302ae
field public static final int Widget_Material_Light_ListView_DropDown = 16974511; // 0x10302af
field public static final int Widget_Material_Light_MediaRouteButton = 16974512; // 0x10302b0
field public static final int Widget_Material_Light_PopupMenu = 16974513; // 0x10302b1
field public static final int Widget_Material_Light_PopupMenu_Overflow = 16974514; // 0x10302b2
field public static final int Widget_Material_Light_PopupWindow = 16974515; // 0x10302b3
field public static final int Widget_Material_Light_ProgressBar = 16974516; // 0x10302b4
field public static final int Widget_Material_Light_ProgressBar_Horizontal = 16974517; // 0x10302b5
field public static final int Widget_Material_Light_ProgressBar_Inverse = 16974518; // 0x10302b6
field public static final int Widget_Material_Light_ProgressBar_Large = 16974519; // 0x10302b7
field public static final int Widget_Material_Light_ProgressBar_Large_Inverse = 16974520; // 0x10302b8
field public static final int Widget_Material_Light_ProgressBar_Small = 16974521; // 0x10302b9
field public static final int Widget_Material_Light_ProgressBar_Small_Inverse = 16974522; // 0x10302ba
field public static final int Widget_Material_Light_ProgressBar_Small_Title = 16974523; // 0x10302bb
field public static final int Widget_Material_Light_RatingBar = 16974524; // 0x10302bc
field public static final int Widget_Material_Light_RatingBar_Indicator = 16974525; // 0x10302bd
field public static final int Widget_Material_Light_RatingBar_Small = 16974526; // 0x10302be
field public static final int Widget_Material_Light_ScrollView = 16974527; // 0x10302bf
field public static final int Widget_Material_Light_SeekBar = 16974528; // 0x10302c0
field public static final int Widget_Material_Light_SegmentedButton = 16974529; // 0x10302c1
field public static final int Widget_Material_Light_Spinner = 16974531; // 0x10302c3
field public static final int Widget_Material_Light_StackView = 16974530; // 0x10302c2
field public static final int Widget_Material_Light_Tab = 16974532; // 0x10302c4
field public static final int Widget_Material_Light_TabWidget = 16974533; // 0x10302c5
field public static final int Widget_Material_Light_TextView = 16974534; // 0x10302c6
field public static final int Widget_Material_Light_TextView_SpinnerItem = 16974535; // 0x10302c7
field public static final int Widget_Material_Light_WebTextView = 16974536; // 0x10302c8
field public static final int Widget_Material_Light_WebView = 16974537; // 0x10302c9
field public static final int Widget_Material_ListPopupWindow = 16974451; // 0x1030273
field public static final int Widget_Material_ListView = 16974452; // 0x1030274
field public static final int Widget_Material_ListView_DropDown = 16974453; // 0x1030275
field public static final int Widget_Material_MediaRouteButton = 16974454; // 0x1030276
field public static final int Widget_Material_PopupMenu = 16974455; // 0x1030277
field public static final int Widget_Material_PopupMenu_Overflow = 16974456; // 0x1030278
field public static final int Widget_Material_PopupWindow = 16974457; // 0x1030279
field public static final int Widget_Material_ProgressBar = 16974458; // 0x103027a
field public static final int Widget_Material_ProgressBar_Horizontal = 16974459; // 0x103027b
field public static final int Widget_Material_ProgressBar_Large = 16974460; // 0x103027c
field public static final int Widget_Material_ProgressBar_Small = 16974461; // 0x103027d
field public static final int Widget_Material_ProgressBar_Small_Title = 16974462; // 0x103027e
field public static final int Widget_Material_RatingBar = 16974463; // 0x103027f
field public static final int Widget_Material_RatingBar_Indicator = 16974464; // 0x1030280
field public static final int Widget_Material_RatingBar_Small = 16974465; // 0x1030281
field public static final int Widget_Material_ScrollView = 16974466; // 0x1030282
field public static final int Widget_Material_SeekBar = 16974467; // 0x1030283
field public static final int Widget_Material_SegmentedButton = 16974468; // 0x1030284
field public static final int Widget_Material_Spinner = 16974470; // 0x1030286
field public static final int Widget_Material_StackView = 16974469; // 0x1030285
field public static final int Widget_Material_Tab = 16974471; // 0x1030287
field public static final int Widget_Material_TabWidget = 16974472; // 0x1030288
field public static final int Widget_Material_TextView = 16974473; // 0x1030289
field public static final int Widget_Material_TextView_SpinnerItem = 16974474; // 0x103028a
field public static final int Widget_Material_WebTextView = 16974475; // 0x103028b
field public static final int Widget_Material_WebView = 16974476; // 0x103028c
field public static final int Widget_Material = 16974420; // 0x1030254
field public static final int Widget_Material_ActionBar = 16974421; // 0x1030255
field public static final int Widget_Material_ActionBar_Solid = 16974422; // 0x1030256
field public static final int Widget_Material_ActionBar_TabBar = 16974423; // 0x1030257
field public static final int Widget_Material_ActionBar_TabText = 16974424; // 0x1030258
field public static final int Widget_Material_ActionBar_TabView = 16974425; // 0x1030259
field public static final int Widget_Material_ActionButton = 16974426; // 0x103025a
field public static final int Widget_Material_ActionButton_CloseMode = 16974427; // 0x103025b
field public static final int Widget_Material_ActionButton_Overflow = 16974428; // 0x103025c
field public static final int Widget_Material_ActionMode = 16974429; // 0x103025d
field public static final int Widget_Material_AutoCompleteTextView = 16974430; // 0x103025e
field public static final int Widget_Material_Button = 16974431; // 0x103025f
field public static final int Widget_Material_ButtonBar = 16974437; // 0x1030265
field public static final int Widget_Material_ButtonBar_AlertDialog = 16974438; // 0x1030266
field public static final int Widget_Material_Button_Borderless = 16974432; // 0x1030260
field public static final int Widget_Material_Button_Borderless_Small = 16974433; // 0x1030261
field public static final int Widget_Material_Button_Inset = 16974434; // 0x1030262
field public static final int Widget_Material_Button_Small = 16974435; // 0x1030263
field public static final int Widget_Material_Button_Toggle = 16974436; // 0x1030264
field public static final int Widget_Material_CalendarView = 16974439; // 0x1030267
field public static final int Widget_Material_CheckedTextView = 16974440; // 0x1030268
field public static final int Widget_Material_CompoundButton_CheckBox = 16974441; // 0x1030269
field public static final int Widget_Material_CompoundButton_RadioButton = 16974442; // 0x103026a
field public static final int Widget_Material_CompoundButton_Star = 16974443; // 0x103026b
field public static final int Widget_Material_DatePicker = 16974444; // 0x103026c
field public static final int Widget_Material_DropDownItem = 16974445; // 0x103026d
field public static final int Widget_Material_DropDownItem_Spinner = 16974446; // 0x103026e
field public static final int Widget_Material_EditText = 16974447; // 0x103026f
field public static final int Widget_Material_ExpandableListView = 16974448; // 0x1030270
field public static final int Widget_Material_FastScroll = 16974449; // 0x1030271
field public static final int Widget_Material_GridView = 16974450; // 0x1030272
field public static final int Widget_Material_HorizontalScrollView = 16974451; // 0x1030273
field public static final int Widget_Material_ImageButton = 16974452; // 0x1030274
field public static final int Widget_Material_Light = 16974481; // 0x1030291
field public static final int Widget_Material_Light_ActionBar = 16974482; // 0x1030292
field public static final int Widget_Material_Light_ActionBar_Solid = 16974483; // 0x1030293
field public static final int Widget_Material_Light_ActionBar_TabBar = 16974484; // 0x1030294
field public static final int Widget_Material_Light_ActionBar_TabText = 16974485; // 0x1030295
field public static final int Widget_Material_Light_ActionBar_TabView = 16974486; // 0x1030296
field public static final int Widget_Material_Light_ActionButton = 16974487; // 0x1030297
field public static final int Widget_Material_Light_ActionButton_CloseMode = 16974488; // 0x1030298
field public static final int Widget_Material_Light_ActionButton_Overflow = 16974489; // 0x1030299
field public static final int Widget_Material_Light_ActionMode = 16974490; // 0x103029a
field public static final int Widget_Material_Light_AutoCompleteTextView = 16974491; // 0x103029b
field public static final int Widget_Material_Light_Button = 16974492; // 0x103029c
field public static final int Widget_Material_Light_ButtonBar = 16974498; // 0x10302a2
field public static final int Widget_Material_Light_ButtonBar_AlertDialog = 16974499; // 0x10302a3
field public static final int Widget_Material_Light_Button_Borderless = 16974493; // 0x103029d
field public static final int Widget_Material_Light_Button_Borderless_Small = 16974494; // 0x103029e
field public static final int Widget_Material_Light_Button_Inset = 16974495; // 0x103029f
field public static final int Widget_Material_Light_Button_Small = 16974496; // 0x10302a0
field public static final int Widget_Material_Light_Button_Toggle = 16974497; // 0x10302a1
field public static final int Widget_Material_Light_CalendarView = 16974500; // 0x10302a4
field public static final int Widget_Material_Light_CheckedTextView = 16974501; // 0x10302a5
field public static final int Widget_Material_Light_CompoundButton_CheckBox = 16974502; // 0x10302a6
field public static final int Widget_Material_Light_CompoundButton_RadioButton = 16974503; // 0x10302a7
field public static final int Widget_Material_Light_CompoundButton_Star = 16974504; // 0x10302a8
field public static final int Widget_Material_Light_DropDownItem = 16974505; // 0x10302a9
field public static final int Widget_Material_Light_DropDownItem_Spinner = 16974506; // 0x10302aa
field public static final int Widget_Material_Light_EditText = 16974507; // 0x10302ab
field public static final int Widget_Material_Light_ExpandableListView = 16974508; // 0x10302ac
field public static final int Widget_Material_Light_FastScroll = 16974509; // 0x10302ad
field public static final int Widget_Material_Light_GridView = 16974510; // 0x10302ae
field public static final int Widget_Material_Light_HorizontalScrollView = 16974511; // 0x10302af
field public static final int Widget_Material_Light_ImageButton = 16974512; // 0x10302b0
field public static final int Widget_Material_Light_ListPopupWindow = 16974513; // 0x10302b1
field public static final int Widget_Material_Light_ListView = 16974514; // 0x10302b2
field public static final int Widget_Material_Light_ListView_DropDown = 16974515; // 0x10302b3
field public static final int Widget_Material_Light_MediaRouteButton = 16974516; // 0x10302b4
field public static final int Widget_Material_Light_PopupMenu = 16974517; // 0x10302b5
field public static final int Widget_Material_Light_PopupMenu_Overflow = 16974518; // 0x10302b6
field public static final int Widget_Material_Light_PopupWindow = 16974519; // 0x10302b7
field public static final int Widget_Material_Light_ProgressBar = 16974520; // 0x10302b8
field public static final int Widget_Material_Light_ProgressBar_Horizontal = 16974521; // 0x10302b9
field public static final int Widget_Material_Light_ProgressBar_Inverse = 16974522; // 0x10302ba
field public static final int Widget_Material_Light_ProgressBar_Large = 16974523; // 0x10302bb
field public static final int Widget_Material_Light_ProgressBar_Large_Inverse = 16974524; // 0x10302bc
field public static final int Widget_Material_Light_ProgressBar_Small = 16974525; // 0x10302bd
field public static final int Widget_Material_Light_ProgressBar_Small_Inverse = 16974526; // 0x10302be
field public static final int Widget_Material_Light_ProgressBar_Small_Title = 16974527; // 0x10302bf
field public static final int Widget_Material_Light_RatingBar = 16974528; // 0x10302c0
field public static final int Widget_Material_Light_RatingBar_Indicator = 16974529; // 0x10302c1
field public static final int Widget_Material_Light_RatingBar_Small = 16974530; // 0x10302c2
field public static final int Widget_Material_Light_ScrollView = 16974531; // 0x10302c3
field public static final int Widget_Material_Light_SeekBar = 16974532; // 0x10302c4
field public static final int Widget_Material_Light_SegmentedButton = 16974533; // 0x10302c5
field public static final int Widget_Material_Light_Spinner = 16974535; // 0x10302c7
field public static final int Widget_Material_Light_StackView = 16974534; // 0x10302c6
field public static final int Widget_Material_Light_Tab = 16974536; // 0x10302c8
field public static final int Widget_Material_Light_TabWidget = 16974537; // 0x10302c9
field public static final int Widget_Material_Light_TextView = 16974538; // 0x10302ca
field public static final int Widget_Material_Light_TextView_SpinnerItem = 16974539; // 0x10302cb
field public static final int Widget_Material_Light_WebTextView = 16974540; // 0x10302cc
field public static final int Widget_Material_Light_WebView = 16974541; // 0x10302cd
field public static final int Widget_Material_ListPopupWindow = 16974453; // 0x1030275
field public static final int Widget_Material_ListView = 16974454; // 0x1030276
field public static final int Widget_Material_ListView_DropDown = 16974455; // 0x1030277
field public static final int Widget_Material_MediaRouteButton = 16974456; // 0x1030278
field public static final int Widget_Material_PopupMenu = 16974457; // 0x1030279
field public static final int Widget_Material_PopupMenu_Overflow = 16974458; // 0x103027a
field public static final int Widget_Material_PopupWindow = 16974459; // 0x103027b
field public static final int Widget_Material_ProgressBar = 16974460; // 0x103027c
field public static final int Widget_Material_ProgressBar_Horizontal = 16974461; // 0x103027d
field public static final int Widget_Material_ProgressBar_Large = 16974462; // 0x103027e
field public static final int Widget_Material_ProgressBar_Small = 16974463; // 0x103027f
field public static final int Widget_Material_ProgressBar_Small_Title = 16974464; // 0x1030280
field public static final int Widget_Material_RatingBar = 16974465; // 0x1030281
field public static final int Widget_Material_RatingBar_Indicator = 16974466; // 0x1030282
field public static final int Widget_Material_RatingBar_Small = 16974467; // 0x1030283
field public static final int Widget_Material_ScrollView = 16974468; // 0x1030284
field public static final int Widget_Material_SeekBar = 16974469; // 0x1030285
field public static final int Widget_Material_SegmentedButton = 16974470; // 0x1030286
field public static final int Widget_Material_Spinner = 16974472; // 0x1030288
field public static final int Widget_Material_StackView = 16974471; // 0x1030287
field public static final int Widget_Material_Tab = 16974473; // 0x1030289
field public static final int Widget_Material_TabWidget = 16974474; // 0x103028a
field public static final int Widget_Material_TextView = 16974475; // 0x103028b
field public static final int Widget_Material_TextView_SpinnerItem = 16974476; // 0x103028c
field public static final int Widget_Material_Toolbar = 16974477; // 0x103028d
field public static final int Widget_Material_Toolbar_Button_Navigation = 16974478; // 0x103028e
field public static final int Widget_Material_WebTextView = 16974479; // 0x103028f
field public static final int Widget_Material_WebView = 16974480; // 0x1030290
field public static final int Widget_PopupMenu = 16973958; // 0x1030086
field public static final int Widget_PopupWindow = 16973878; // 0x1030036
field public static final int Widget_ProgressBar = 16973852; // 0x103001c
@@ -2454,6 +2455,8 @@ package android {
field public static final int Widget_TextView = 16973858; // 0x1030022
field public static final int Widget_TextView_PopupMenu = 16973865; // 0x1030029
field public static final int Widget_TextView_SpinnerItem = 16973866; // 0x103002a
field public static final int Widget_Toolbar = 16974339; // 0x1030203
field public static final int Widget_Toolbar_Button_Navigation = 16974340; // 0x1030204
field public static final int Widget_WebView = 16973875; // 0x1030033
field public static final int l_resource_pad1 = 16974336; // 0x1030200
field public static final int l_resource_pad10 = 16974327; // 0x10301f7
@@ -11458,6 +11461,7 @@ package android.graphics.drawable {
public class RippleDrawable extends android.graphics.drawable.LayerDrawable {
ctor public RippleDrawable(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
method public void setColor(android.content.res.ColorStateList);
}
public class RotateDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {

2
core/res/res/drawable/btn_borderless_material.xml
View File

@@ -15,7 +15,7 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?attr/colorControlHighlight">
android:color="?attr/colorControlHighlight">
<item android:id="@id/mask"
android:drawable="@drawable/btn_mtrl_alpha" />
</ripple>

2
core/res/res/drawable/btn_default_material.xml
View File

@@ -15,7 +15,7 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?attr/colorControlHighlight">
android:color="?attr/colorControlHighlight">
<item>
<nine-patch android:src="@drawable/btn_mtrl_alpha"
android:tint="?attr/colorButtonNormal" />

2
core/res/res/drawable/btn_toggle_material.xml
View File

@@ -21,7 +21,7 @@
android:insetRight="4dp">
<layer-list android:paddingMode="stack">
<item>
<ripple android:tint="?attr/colorControlHighlight">
<ripple android:color="?attr/colorControlHighlight">
<item>
<nine-patch android:src="@drawable/btn_toggle_mtrl_alpha"
android:tint="?attr/colorButtonNormal" />

3
core/res/res/drawable/edit_text_material.xml
View File

@@ -15,8 +15,7 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?attr/colorControlActivated"
android:tintMode="src_over">
android:color="?attr/colorControlActivated">
<item>
<selector>
<item android:state_enabled="false">

3
core/res/res/drawable/item_background_borderless_material.xml
View File

@@ -15,5 +15,4 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?attr/colorControlHighlight"
android:pinned="true" />
android:color="?attr/colorControlHighlight" />

4
core/res/res/drawable/item_background_material.xml
View File

@@ -15,8 +15,8 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?attr/colorControlHighlight">
android:color="?attr/colorControlHighlight">
<item android:id="@id/mask">
<color android:color="@color/white" />
</item>
</ripple>
</ripple>

6
core/res/res/drawable/notification_bg_dim.xml
View File

@@ -15,9 +15,7 @@
~ limitations under the License
-->
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="#ff444444"
>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#ff444444">
<item android:drawable="@drawable/notification_bg_normal" />
</ripple>

15
core/res/res/drawable/notification_material_bg_dim.xml
View File

@@ -15,15 +15,18 @@
~ limitations under the License
-->
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="#ffffffff"
android:tintMode="src_over"
>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/white">
<item>
<shape>
<solid android:color="#d4ffffff" />
<corners android:radius="@dimen/notification_material_rounded_rect_radius" />
</shape>
</item>
</ripple>
<item android:id="@id/mask">
<shape>
<solid android:color="@color/white" />
<corners android:radius="@dimen/notification_material_rounded_rect_radius" />
</shape>
</item>
</ripple>

3
core/res/res/layout/preference_widget_checkbox.xml
View File

@@ -21,4 +21,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false" />
android:clickable="false"
android:background="@null" />

3
core/res/res/layout/preference_widget_switch.xml
View File

@@ -21,4 +21,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dip"
android:focusable="false" />
android:focusable="false"
android:background="@null" />

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

@@ -4669,12 +4669,8 @@
<!-- Drawable used to show animated touch feedback. -->
<declare-styleable name="RippleDrawable">
<!-- The tint to use for ripple effects. This attribute is required. -->
<attr name="tint" />
<!-- Specifies the Porter-Duff blending mode used to apply the tint. The default value is src_atop, which draws over the opaque parts of the drawable. -->
<attr name="tintMode" />
<!-- Whether to pin ripple effects to the center of the drawable. Default value is false. -->
<attr name="pinned" format="boolean" />
<!-- The color to use for ripple effects. This attribute is required. -->
<attr name="color" />
</declare-styleable>
<declare-styleable name="ScaleDrawable">

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

@@ -2132,7 +2132,6 @@
<public type="attr" name="strokeLineJoin" />
<public type="attr" name="clipToPath" />
<public type="attr" name="requiredForProfile"/>
<public type="attr" name="pinned" />
<public type="attr" name="colorControlNormal" />
<public type="attr" name="colorControlActivated" />
<public type="attr" name="colorButtonNormal" />
@@ -2193,6 +2192,8 @@
<public type="style" name="Widget.FastScroll" />
<public type="style" name="Widget.StackView" />
<public type="style" name="Widget.Toolbar" />
<public type="style" name="Widget.Toolbar.Button.Navigation" />
<public type="style" name="Widget.Holo.FastScroll" />
<public type="style" name="Widget.Holo.StackView" />
@@ -2339,6 +2340,8 @@
<public type="style" name="Widget.Material.TabWidget" />
<public type="style" name="Widget.Material.TextView" />
<public type="style" name="Widget.Material.TextView.SpinnerItem" />
<public type="style" name="Widget.Material.Toolbar" />
<public type="style" name="Widget.Material.Toolbar.Button.Navigation" />
<public type="style" name="Widget.Material.WebTextView" />
<public type="style" name="Widget.Material.WebView" />

8
core/res/res/values/styles_material.xml
View File

@@ -646,6 +646,14 @@ please see styles_device_defaults.xml.
<item name="maxWidth">180dip</item>
</style>
<style name="Widget.Material.Toolbar" parent="Widget.Toolbar">
<item name="android:navigationButtonStyle">@android:style/Widget.Material.Toolbar.Button.Navigation</item>
</style>
<style name="Widget.Material.Toolbar.Button.Navigation" parent="Widget.Toolbar.Button.Navigation">
<item name="android:background">?attr/selectableItemBackgroundBorderless</item>
</style>
<style name="Widget.Material.WebTextView" parent="Widget.WebTextView"/>
<style name="Widget.Material.WebView" parent="Widget.WebView"/>

4
core/res/res/values/themes_material.xml
View File

@@ -321,6 +321,8 @@ please see themes_device_defaults.xml.
<item name="actionModeFindDrawable">@drawable/ic_menu_find_material</item>
<item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_material</item>
<item name="toolbarStyle">@style/Widget.Material.Toolbar</item>
<item name="dividerVertical">?attr/listDivider</item>
<item name="dividerHorizontal">?attr/listDivider</item>
<item name="buttonBarStyle">@style/Widget.Material.ButtonBar</item>
@@ -667,6 +669,8 @@ please see themes_device_defaults.xml.
<item name="actionModeFindDrawable">@drawable/ic_menu_find_material</item>
<item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_material</item>
<item name="toolbarStyle">@style/Widget.Material.Toolbar</item>
<item name="dividerVertical">?attr/listDivider</item>
<item name="dividerHorizontal">?attr/listDivider</item>
<item name="buttonBarStyle">@style/Widget.Material.Light.ButtonBar</item>

36
graphics/java/android/graphics/drawable/Ripple.java
View File

@@ -68,6 +68,8 @@ class Ripple {
private float mStartingX;
private float mStartingY;
private float mClampedStartingX;
private float mClampedStartingY;
// Hardware rendering properties.
private CanvasProperty<Paint> mPropPaint;
@@ -112,6 +114,7 @@ class Ripple {
public Ripple(RippleDrawable owner, Rect bounds, float startingX, float startingY) {
mOwner = owner;
mBounds = bounds;
mStartingX = startingX;
mStartingY = startingY;
}
@@ -131,6 +134,23 @@ class Ripple {
mOuterX = 0;
mOuterY = 0;
mDensity = density;
clampStartingPosition();
}
private void clampStartingPosition() {
final float dX = mStartingX - mBounds.exactCenterX();
final float dY = mStartingY - mBounds.exactCenterY();
final float r = mOuterRadius;
if (dX * dX + dY * dY > r * r) {
// Point is outside the circle, clamp to the circumference.
final double angle = Math.atan2(dY, dX);
mClampedStartingX = (float) (Math.cos(angle) * r);
mClampedStartingY = (float) (Math.sin(angle) * r);
} else {
mClampedStartingX = mStartingX;
mClampedStartingY = mStartingY;
}
}
public void onHotspotBoundsChanged() {
@@ -138,6 +158,8 @@ class Ripple {
final float halfWidth = mBounds.width() / 2.0f;
final float halfHeight = mBounds.height() / 2.0f;
mOuterRadius = (float) Math.sqrt(halfWidth * halfWidth + halfHeight * halfHeight);
clampStartingPosition();
}
}
@@ -247,8 +269,10 @@ class Ripple {
final int alpha = (int) (paintAlpha * mOpacity + 0.5f);
final float radius = MathUtils.lerp(0, mOuterRadius, mTweenRadius);
if (alpha > 0 && radius > 0) {
final float x = MathUtils.lerp(mStartingX - mBounds.exactCenterX(), mOuterX, mTweenX);
final float y = MathUtils.lerp(mStartingY - mBounds.exactCenterY(), mOuterY, mTweenY);
final float x = MathUtils.lerp(
mClampedStartingX - mBounds.exactCenterX(), mOuterX, mTweenX);
final float y = MathUtils.lerp(
mClampedStartingY - mBounds.exactCenterY(), mOuterY, mTweenY);
p.setAlpha(alpha);
p.setStyle(Style.FILL);
c.drawCircle(x, y, radius, p);
@@ -277,6 +301,8 @@ class Ripple {
public void move(float x, float y) {
mStartingX = x;
mStartingY = y;
clampStartingPosition();
}
/**
@@ -361,8 +387,10 @@ class Ripple {
int inflectionOpacity) {
mPendingAnimations.clear();
final float startX = MathUtils.lerp(mStartingX - mBounds.exactCenterX(), mOuterX, mTweenX);
final float startY = MathUtils.lerp(mStartingY - mBounds.exactCenterY(), mOuterY, mTweenY);
final float startX = MathUtils.lerp(
mClampedStartingX - mBounds.exactCenterX(), mOuterX, mTweenX);
final float startY = MathUtils.lerp(
mClampedStartingY - mBounds.exactCenterY(), mOuterY, mTweenY);
final Paint outerPaint = new Paint();
outerPaint.setAntiAlias(true);
outerPaint.setColor(mColor);

136
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -48,22 +48,41 @@ import java.io.IOException;
* A touch feedback drawable may contain multiple child layers, including a
* special mask layer that is not drawn to the screen. A single layer may be set
* as the mask by specifying its android:id value as {@link android.R.id#mask}.
* <pre>
* <code>&lt!-- A red ripple masked against an opaque rectangle. --/>
* &ltripple android:color="#ffff0000">
* &ltitem android:id="@android:id/mask"
* android:drawable="#ffffffff" />
* &ltripple /></code>
* </pre>
* <p>
* If a mask layer is set, the ripple effect will be masked against that layer
* before it is blended onto the composite of the remaining child layers.
* before it is drawn over the composite of the remaining child layers.
* <p>
* If no mask layer is set, the ripple effect is simply blended onto the
* composite of the child layers using the specified
* {@link android.R.styleable#RippleDrawable_tintMode}.
* If no mask layer is set, the ripple effect is masked against the composite
* of the child layers.
* <pre>
* <code>&lt!-- A blue ripple drawn atop a green rectangle. --/>
* &ltripple android:color="#ff00ff00">
* &ltitem android:drawable="#ff0000ff" />
* &ltripple />
*
* &lt!-- A red ripple drawn atop a drawable resource. --/>
* &ltripple android:color="#ff00ff00">
* &ltitem android:drawable="@drawable/my_drawable" />
* &ltripple /></code>
* </pre>
* <p>
* If no child layers or mask is specified and the ripple is set as a View
* background, the ripple will be blended onto the first available parent
* background within the View's hierarchy using the specified
* {@link android.R.styleable#RippleDrawable_tintMode}. In this case, the
* drawing region may extend outside of the Drawable bounds.
* background, the ripple will be drawn atop the first available parent
* background within the View's hierarchy. In this case, the drawing region
* may extend outside of the Drawable bounds.
* <pre>
* <code>&lt!-- An unbounded green ripple. --/>
* &ltripple android:color="#ff0000ff" /></code>
* </pre>
*
* @attr ref android.R.styleable#DrawableStates_state_focused
* @attr ref android.R.styleable#DrawableStates_state_pressed
* @attr ref android.R.styleable#RippleDrawable_color
*/
public class RippleDrawable extends LayerDrawable {
private static final String LOG_TAG = RippleDrawable.class.getSimpleName();
@@ -188,8 +207,8 @@ public class RippleDrawable extends LayerDrawable {
setActive(active && enabled);
// Update the paint color. Only applicable when animated in software.
if (mRipplePaint != null && mState.mTint != null) {
final ColorStateList stateList = mState.mTint;
if (mRipplePaint != null && mState.mColor != null) {
final ColorStateList stateList = mState.mColor;
final int newColor = stateList.getColorForState(stateSet, 0);
final int oldColor = mRipplePaint.getColor();
if (oldColor != newColor) {
@@ -248,10 +267,8 @@ public class RippleDrawable extends LayerDrawable {
return true;
}
@Override
public void setTint(ColorStateList tint, Mode tintMode) {
mState.mTint = tint;
mState.setTintMode(tintMode);
public void setColor(ColorStateList color) {
mState.mColor = color;
invalidateSelf();
}
@@ -312,22 +329,15 @@ public class RippleDrawable extends LayerDrawable {
// Extract the theme attributes, if any.
state.mTouchThemeAttrs = a.extractThemeAttrs();
final ColorStateList tint = a.getColorStateList(R.styleable.RippleDrawable_tint);
if (tint != null) {
mState.mTint = tint;
final ColorStateList color = a.getColorStateList(R.styleable.RippleDrawable_color);
if (color != null) {
mState.mColor = color;
}
final int tintMode = a.getInt(R.styleable.RippleDrawable_tintMode, -1);
if (tintMode != -1) {
mState.setTintMode(Drawable.parseTintMode(tintMode, Mode.SRC_ATOP));
}
mState.mPinned = a.getBoolean(R.styleable.RippleDrawable_pinned, mState.mPinned);
// If we're not waiting on a theme, verify required attributes.
if (state.mTouchThemeAttrs == null && mState.mTint == null) {
if (state.mTouchThemeAttrs == null && mState.mColor == null) {
throw new XmlPullParserException(a.getPositionDescription() +
": <ripple> requires a valid tint attribute");
": <ripple> requires a valid color attribute");
}
}
@@ -372,11 +382,6 @@ public class RippleDrawable extends LayerDrawable {
@Override
public void setHotspot(float x, float y) {
if (mState.mPinned && !circleContains(mHotspotBounds, x, y)) {
x = mHotspotBounds.exactCenterX();
y = mHotspotBounds.exactCenterY();
}
if (mHotspot == null) {
mHotspot = new Ripple(this, mHotspotBounds, x, y);
@@ -388,18 +393,6 @@ public class RippleDrawable extends LayerDrawable {
}
}
private boolean circleContains(Rect bounds, float x, float y) {
final float pX = bounds.exactCenterX() - x;
final float pY = bounds.exactCenterY() - y;
final double pointRadius = Math.sqrt(pX * pX + pY * pY);
final float bX = bounds.width() / 2.0f;
final float bY = bounds.height() / 2.0f;
final double boundsRadius = Math.sqrt(bX * bX + bY * bY);
return pointRadius < boundsRadius;
}
/**
* Creates an active hotspot at the specified location.
*/
@@ -417,7 +410,7 @@ public class RippleDrawable extends LayerDrawable {
mHotspot = new Ripple(this, mHotspotBounds, x, y);
}
final int color = mState.mTint.getColorForState(getState(), Color.TRANSPARENT);
final int color = mState.mColor.getColorForState(getState(), Color.TRANSPARENT);
mHotspot.setup(mState.mMaxRadius, color, mDensity);
mHotspot.enter();
@@ -485,8 +478,10 @@ public class RippleDrawable extends LayerDrawable {
final int contentLayer = drawNonMaskContent ?
drawContentLayer(canvas, bounds, SRC_OVER) : -1;
// Next, try to draw the ripples (into a layer if necessary).
final int rippleLayer = drawRippleLayer(canvas, bounds, mState.mTintXfermode);
// Next, try to draw the ripples (into a layer if necessary). If we need
// to mask against the underlying content, set the xfermode to SRC_ATOP.
final PorterDuffXfermode xfermode = (hasMask || !drawNonMaskContent) ? SRC_OVER : SRC_ATOP;
final int rippleLayer = drawRippleLayer(canvas, bounds, xfermode);
// If we have ripples and a non-opaque mask, draw the masking layer.
if (rippleLayer >= 0 && drawMask) {
@@ -533,14 +528,27 @@ public class RippleDrawable extends LayerDrawable {
}
private int drawContentLayer(Canvas canvas, Rect bounds, PorterDuffXfermode mode) {
// TODO: We don't need a layer if all the content is opaque.
final Paint maskingPaint = getMaskingPaint(mode);
final int restoreToCount = canvas.saveLayer(bounds.left, bounds.top,
bounds.right, bounds.bottom, maskingPaint);
// Draw everything except the mask.
final ChildDrawable[] array = mLayerState.mChildren;
final int count = mLayerState.mNum;
// We don't need a layer if we don't expect to draw any ripples, we have
// an explicit mask, or if the non-mask content is all opaque.
boolean needsLayer = false;
if (mAnimatingRipplesCount > 0 && mMask == null) {
for (int i = 0; i < count; i++) {
if (array[i].mId != R.id.mask
&& array[i].mDrawable.getOpacity() != PixelFormat.OPAQUE) {
needsLayer = true;
break;
}
}
}
final Paint maskingPaint = getMaskingPaint(mode);
final int restoreToCount = needsLayer ? canvas.saveLayer(bounds.left, bounds.top,
bounds.right, bounds.bottom, maskingPaint) : -1;
// Draw everything except the mask.
for (int i = 0; i < count; i++) {
if (array[i].mId != R.id.mask) {
array[i].mDrawable.draw(canvas);
@@ -559,8 +567,8 @@ public class RippleDrawable extends LayerDrawable {
// Separate the ripple color and alpha channel. The alpha will be
// applied when we merge the ripples down to the canvas.
final int rippleARGB;
if (mState.mTint != null) {
rippleARGB = mState.mTint.getColorForState(getState(), Color.TRANSPARENT);
if (mState.mColor != null) {
rippleARGB = mState.mColor.getColorForState(getState(), Color.TRANSPARENT);
} else {
rippleARGB = Color.TRANSPARENT;
}
@@ -665,31 +673,19 @@ public class RippleDrawable extends LayerDrawable {
static class RippleState extends LayerState {
int[] mTouchThemeAttrs;
ColorStateList mTint = null;
PorterDuffXfermode mTintXfermode = SRC_ATOP;
ColorStateList mColor = null;
int mMaxRadius = RADIUS_AUTO;
boolean mPinned = false;
public RippleState(RippleState orig, RippleDrawable owner, Resources res) {
super(orig, owner, res);
if (orig != null) {
mTouchThemeAttrs = orig.mTouchThemeAttrs;
mTint = orig.mTint;
mTintXfermode = orig.mTintXfermode;
mColor = orig.mColor;
mMaxRadius = orig.mMaxRadius;
mPinned = orig.mPinned;
}
}
public void setTintMode(Mode mode) {
mTintXfermode = new PorterDuffXfermode(mode);
}
public PorterDuffXfermode getTintXfermode() {
return mTintXfermode;
}
@Override
public boolean canApplyTheme() {
return mTouchThemeAttrs != null || super.canApplyTheme();

4
packages/SystemUI/res/drawable/ripple_drawable.xml
View File

@@ -16,6 +16,4 @@
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?android:attr/colorControlHighlight"
android:tintMode="src_over"
android:pinned="true" />
android:color="?android:attr/colorControlHighlight" />