From d9c37653d9fabca1aa436154f369bb8cc8e25ae4 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Tue, 13 May 2014 19:11:33 -0700 Subject: [PATCH] Fix build Change-Id: I595d4e1b4a044a454c77526696c7edc70ac57f88 --- api/current.txt | 70 ++++++++++----------- core/res/res/drawable/btn_color_quantum.xml | 30 --------- core/res/res/values/public.xml | 2 - core/res/res/values/themes_quantum.xml | 3 - 4 files changed, 34 insertions(+), 71 deletions(-) delete mode 100644 core/res/res/drawable/btn_color_quantum.xml diff --git a/api/current.txt b/api/current.txt index 5bf6ec17bed4f..eb1f46b97dae9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -250,7 +250,7 @@ package android { field public static final int actionBarTabBarStyle = 16843508; // 0x10102f4 field public static final int actionBarTabStyle = 16843507; // 0x10102f3 field public static final int actionBarTabTextStyle = 16843509; // 0x10102f5 - field public static final int actionBarTheme = 16843831; // 0x1010437 + field public static final int actionBarTheme = 16843829; // 0x1010435 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 = 16843851; // 0x101044b + field public static final int actionOverflowMenuStyle = 16843849; // 0x1010449 field public static final int actionProviderClass = 16843657; // 0x1010389 field public static final int actionViewClass = 16843516; // 0x10102fc field public static final int activatedBackgroundIndicator = 16843517; // 0x10102fd @@ -313,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 = 16843853; // 0x101044d + field public static final int autoRemoveFromRecents = 16843851; // 0x101044b 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 @@ -386,14 +386,12 @@ 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 = 16843836; // 0x101043c + field public static final int colorAccent = 16843834; // 0x101043a 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 = 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 @@ -402,9 +400,9 @@ package android { 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 = 16843834; // 0x101043a - field public static final int colorPrimaryDark = 16843835; // 0x101043b - field public static final int colorPrimaryLight = 16843833; // 0x1010439 + field public static final int colorPrimary = 16843832; // 0x1010438 + field public static final int colorPrimaryDark = 16843833; // 0x1010439 + field public static final int colorPrimaryLight = 16843831; // 0x1010437 field public static final int columnCount = 16843639; // 0x1010377 field public static final int columnDelay = 16843215; // 0x10101cf field public static final int columnOrderPreserved = 16843640; // 0x1010378 @@ -463,7 +461,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 = 16843852; // 0x101044c + field public static final int documentLaunchMode = 16843850; // 0x101044a field public static final int drawSelectorOnTop = 16843004; // 0x10100fc field public static final int drawable = 16843161; // 0x1010199 field public static final int drawableBottom = 16843118; // 0x101016e @@ -492,7 +490,7 @@ 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 elevation = 16843847; // 0x1010447 + field public static final int elevation = 16843845; // 0x1010445 field public static final int ellipsize = 16842923; // 0x10100ab field public static final int ems = 16843096; // 0x1010158 field public static final int enabled = 16842766; // 0x101000e @@ -502,10 +500,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 = 16843849; // 0x1010449 + field public static final int excludeClass = 16843847; // 0x1010447 field public static final int excludeFromRecents = 16842775; // 0x1010017 - field public static final int excludeId = 16843848; // 0x1010448 - field public static final int excludeViewName = 16843860; // 0x1010454 + field public static final int excludeId = 16843846; // 0x1010446 + field public static final int excludeViewName = 16843858; // 0x1010452 field public static final int exitFadeDuration = 16843533; // 0x101030d field public static final int expandableListPreferredChildIndicatorLeft = 16842834; // 0x1010052 field public static final int expandableListPreferredChildIndicatorRight = 16842835; // 0x1010053 @@ -568,7 +566,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 = 16843856; // 0x1010450 + field public static final int fromId = 16843854; // 0x101044e field public static final int fromScene = 16843741; // 0x10103dd field public static final int fromXDelta = 16843206; // 0x10101c6 field public static final int fromXScale = 16843202; // 0x10101c2 @@ -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 = 16843850; // 0x101044a + field public static final int hideOnContentScroll = 16843848; // 0x1010448 field public static final int hint = 16843088; // 0x1010150 field public static final int homeAsUpIndicator = 16843531; // 0x101030b field public static final int homeLayout = 16843549; // 0x101031d @@ -832,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 = 16843837; // 0x101043d + field public static final int nestedScrollingEnabled = 16843835; // 0x101043b field public static final int nextFocusDown = 16842980; // 0x10100e4 field public static final int nextFocusForward = 16843580; // 0x101033c field public static final int nextFocusLeft = 16842977; // 0x10100e1 @@ -881,7 +879,7 @@ 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 = 16843827; // 0x1010433 + field public static final int persistable = 16843825; // 0x1010431 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 @@ -958,7 +956,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 = 16843857; // 0x1010451 + field public static final int reversible = 16843855; // 0x101044f field public static final int right = 16843183; // 0x10101af field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093 field public static final int ringtoneType = 16843257; // 0x10101f9 @@ -1014,7 +1012,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 sessionService = 16843844; // 0x1010444 + field public static final int sessionService = 16843842; // 0x1010442 field public static final int settingsActivity = 16843301; // 0x1010225 field public static final int shadowColor = 16843105; // 0x1010161 field public static final int shadowDx = 16843106; // 0x1010162 @@ -1035,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 = 16843830; // 0x1010436 + field public static final int slideEdge = 16843828; // 0x1010434 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 +1045,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 = 16843858; // 0x1010452 + field public static final int splitTrack = 16843856; // 0x1010450 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 = 16843845; // 0x1010445 + field public static final int stackViewStyle = 16843843; // 0x1010443 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 = 16843854; // 0x101044e + field public static final int stateListAnimator = 16843852; // 0x101044c 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 @@ -1095,7 +1093,7 @@ package android { 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 = 16843829; // 0x1010435 + field public static final int subtitleTextAppearance = 16843827; // 0x1010433 field public static final int subtitleTextStyle = 16843513; // 0x10102f9 field public static final int subtypeExtraValue = 16843674; // 0x101039a field public static final int subtypeId = 16843713; // 0x10103c1 @@ -1112,7 +1110,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 = 16843846; // 0x1010446 + field public static final int switchStyle = 16843844; // 0x1010444 field public static final int switchTextAppearance = 16843630; // 0x101036e field public static final int switchTextOff = 16843628; // 0x101036c field public static final int switchTextOn = 16843627; // 0x101036b @@ -1128,7 +1126,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 = 16843859; // 0x1010453 + field public static final int targetViewName = 16843857; // 0x1010451 field public static final int taskAffinity = 16842770; // 0x1010012 field public static final int taskCloseEnterAnimation = 16842942; // 0x10100be field public static final int taskCloseExitAnimation = 16842943; // 0x10100bf @@ -1150,7 +1148,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 = 16843832; // 0x1010438 + field public static final int textAppearanceListItemSecondary = 16843830; // 0x1010436 field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f field public static final int textAppearanceMedium = 16842817; // 0x1010041 field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044 @@ -1214,11 +1212,11 @@ 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 = 16843828; // 0x1010434 + field public static final int titleTextAppearance = 16843826; // 0x1010432 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 = 16843855; // 0x101044f + field public static final int toId = 16843853; // 0x101044d field public static final int toScene = 16843742; // 0x10103de field public static final int toXDelta = 16843207; // 0x10101c7 field public static final int toXScale = 16843203; // 0x10101c3 @@ -1298,8 +1296,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 = 16843843; // 0x1010443 - field public static final int windowAllowExitTransitionOverlap = 16843842; // 0x1010442 + field public static final int windowAllowEnterTransitionOverlap = 16843841; // 0x1010441 + field public static final int windowAllowExitTransitionOverlap = 16843840; // 0x1010440 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 +1307,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 = 16843838; // 0x101043e + field public static final int windowEnterTransition = 16843836; // 0x101043c field public static final int windowExitAnimation = 16842933; // 0x10100b5 - field public static final int windowExitTransition = 16843839; // 0x101043f + field public static final int windowExitTransition = 16843837; // 0x101043d 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 +1320,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 = 16843840; // 0x1010440 - field public static final int windowSharedElementExitTransition = 16843841; // 0x1010441 + field public static final int windowSharedElementEnterTransition = 16843838; // 0x101043e + field public static final int windowSharedElementExitTransition = 16843839; // 0x101043f field public static final int windowShowAnimation = 16842934; // 0x10100b6 field public static final int windowShowWallpaper = 16843410; // 0x1010292 field public static final int windowSoftInputMode = 16843307; // 0x101022b diff --git a/core/res/res/drawable/btn_color_quantum.xml b/core/res/res/drawable/btn_color_quantum.xml deleted file mode 100644 index 2da9226a7777f..0000000000000 --- a/core/res/res/drawable/btn_color_quantum.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 74b2f7b12d25a..3ef4ab6efb2d9 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2136,8 +2136,6 @@ - - diff --git a/core/res/res/values/themes_quantum.xml b/core/res/res/values/themes_quantum.xml index 18d6f80e3f4ff..6f93c8291f1c5 100644 --- a/core/res/res/values/themes_quantum.xml +++ b/core/res/res/values/themes_quantum.xml @@ -377,9 +377,6 @@ please see themes_device_defaults.xml. ?attr/colorPrimary @color/quantum_grey_700 @color/quantum_grey_500 - - ?attr/colorPrimary - ?attr/colorPrimaryLight