Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82a8c5f2 authored by Akshay Thakker's avatar Akshay Thakker Committed by Android (Google) Code Review
Browse files

Merge "Revert "Finalize resource IDs for N."" into nyc-dev

parents bf932b00 9ed5eefc

api/current.txt

+50 −49
Original line number Diff line number Diff line
@@ -299,13 +299,13 @@ package android { 
    field public static final int backgroundTint = 16843883; // 0x101046b

    field public static final int backgroundTintMode = 16843884; // 0x101046c

    field public static final int backupAgent = 16843391; // 0x101027f

    field public static final int backupInForeground = 16844058; // 0x101051a

    field public static final int backupInForeground = 16844059; // 0x101051b

    field public static final int banner = 16843762; // 0x10103f2

    field public static final int baseline = 16843548; // 0x101031c

    field public static final int baselineAlignBottom = 16843042; // 0x1010122

    field public static final int baselineAligned = 16843046; // 0x1010126

    field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127

    field public static final int bitmap = 16844054; // 0x1010516

    field public static final int bitmap = 16844055; // 0x1010517

    field public static final int borderlessButtonStyle = 16843563; // 0x101032b

    field public static final int bottom = 16843184; // 0x10101b0

    field public static final int bottomBright = 16842957; // 0x10100cd
@@ -324,7 +324,7 @@ package android { 
    field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a

    field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489

    field public static final int buttonBarStyle = 16843566; // 0x101032e

    field public static final int buttonGravity = 16844030; // 0x10104fe

    field public static final int buttonGravity = 16844031; // 0x10104ff

    field public static final int buttonStyle = 16842824; // 0x1010048

    field public static final int buttonStyleInset = 16842826; // 0x101004a

    field public static final int buttonStyleSmall = 16842825; // 0x1010049
@@ -335,9 +335,9 @@ package android { 
    field public static final int calendarTextColor = 16843931; // 0x101049b

    field public static final int calendarViewShown = 16843596; // 0x101034c

    field public static final int calendarViewStyle = 16843613; // 0x101035d

    field public static final int canControlMagnification = 16844039; // 0x1010507

    field public static final int canPerformGestures = 16844045; // 0x101050d

    field public static final int canRecord = 16844060; // 0x101051c

    field public static final int canControlMagnification = 16844040; // 0x1010508

    field public static final int canPerformGestures = 16844046; // 0x101050e

    field public static final int canRecord = 16844061; // 0x101051d

    field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7
@@ -377,7 +377,7 @@ package android { 
    field public static final int codes = 16843330; // 0x1010242

    field public static final int collapseColumns = 16843083; // 0x101014b

    field public static final int collapseContentDescription = 16843984; // 0x10104d0

    field public static final int collapseIcon = 16844031; // 0x10104ff

    field public static final int collapseIcon = 16844032; // 0x1010500

    field public static final int color = 16843173; // 0x10101a5

    field public static final int colorAccent = 16843829; // 0x1010435

    field public static final int colorActivatedHighlight = 16843664; // 0x1010390
@@ -414,18 +414,18 @@ package android { 
    field public static final int contentAuthority = 16843408; // 0x1010290

    field public static final int contentDescription = 16843379; // 0x1010273

    field public static final int contentInsetEnd = 16843860; // 0x1010454

    field public static final int contentInsetEndWithActions = 16844067; // 0x1010523

    field public static final int contentInsetEndWithActions = 16844070; // 0x1010526

    field public static final int contentInsetLeft = 16843861; // 0x1010455

    field public static final int contentInsetRight = 16843862; // 0x1010456

    field public static final int contentInsetStart = 16843859; // 0x1010453

    field public static final int contentInsetStartWithNavigation = 16844066; // 0x1010522

    field public static final int contentInsetStartWithNavigation = 16844069; // 0x1010525

    field public static final int contextClickable = 16844007; // 0x10104e7

    field public static final int contextPopupMenuStyle = 16844033; // 0x1010501

    field public static final int contextPopupMenuStyle = 16844034; // 0x1010502

    field public static final int controlX1 = 16843772; // 0x10103fc

    field public static final int controlX2 = 16843774; // 0x10103fe

    field public static final int controlY1 = 16843773; // 0x10103fd

    field public static final int controlY2 = 16843775; // 0x10103ff

    field public static final int countDown = 16844059; // 0x101051b

    field public static final int countDown = 16844060; // 0x101051c

    field public static final int country = 16843962; // 0x10104ba

    field public static final int cropToPadding = 16843043; // 0x1010123

    field public static final int cursorVisible = 16843090; // 0x1010152
@@ -443,7 +443,7 @@ package android { 
    field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495

    field public static final int debuggable = 16842767; // 0x101000f

    field public static final int defaultHeight = 16844021; // 0x10104f5

    field public static final int defaultToDeviceProtectedStorage = 16844036; // 0x1010504

    field public static final int defaultToDeviceProtectedStorage = 16844037; // 0x1010505

    field public static final int defaultValue = 16843245; // 0x10101ed

    field public static final int defaultWidth = 16844020; // 0x10104f4

    field public static final int delay = 16843212; // 0x10101cc
@@ -463,7 +463,7 @@ package android { 
    field public static final int dialogTheme = 16843528; // 0x1010308

    field public static final int dialogTitle = 16843250; // 0x10101f2

    field public static final int digits = 16843110; // 0x1010166

    field public static final int directBootAware = 16844037; // 0x1010505

    field public static final int directBootAware = 16844038; // 0x1010506

    field public static final int direction = 16843217; // 0x10101d1

    field public static final deprecated int directionDescriptions = 16843681; // 0x10103a1

    field public static final int directionPriority = 16843218; // 0x10101d2
@@ -511,12 +511,12 @@ package android { 
    field public static final int elevation = 16843840; // 0x1010440

    field public static final int ellipsize = 16842923; // 0x10100ab

    field public static final int ems = 16843096; // 0x1010158

    field public static final int enableVrMode = 16844069; // 0x1010525

    field public static final int enableVrMode = 16844072; // 0x1010528

    field public static final int enabled = 16842766; // 0x101000e

    field public static final int end = 16843996; // 0x10104dc

    field public static final int endColor = 16843166; // 0x101019e

    field public static final int endX = 16844050; // 0x1010512

    field public static final int endY = 16844051; // 0x1010513

    field public static final int endX = 16844051; // 0x1010513

    field public static final int endY = 16844052; // 0x1010514

    field public static final deprecated int endYear = 16843133; // 0x101017d

    field public static final int enterFadeDuration = 16843532; // 0x101030c

    field public static final int entries = 16842930; // 0x10100b2
@@ -536,7 +536,7 @@ package android { 
    field public static final int expandableListViewStyle = 16842863; // 0x101006f

    field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6

    field public static final int exported = 16842768; // 0x1010010

    field public static final int externalService = 16844046; // 0x101050e

    field public static final int externalService = 16844047; // 0x101050f

    field public static final int extraTension = 16843371; // 0x101026b

    field public static final int extractNativeLibs = 16844010; // 0x10104ea

    field public static final int factor = 16843219; // 0x10101d3
@@ -561,7 +561,7 @@ package android { 
    field public static final int fillBefore = 16843196; // 0x10101bc

    field public static final int fillColor = 16843780; // 0x1010404

    field public static final int fillEnabled = 16843343; // 0x101024f

    field public static final int fillType = 16844062; // 0x101051e

    field public static final int fillType = 16844064; // 0x1010520

    field public static final int fillViewport = 16843130; // 0x101017a

    field public static final int filter = 16843035; // 0x101011b

    field public static final int filterTouchesWhenObscured = 16843460; // 0x10102c4
@@ -577,7 +577,7 @@ package android { 
    field public static final int fontFamily = 16843692; // 0x10103ac

    field public static final int fontFeatureSettings = 16843959; // 0x10104b7

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521

    field public static final int forceHasOverlappingRendering = 16844068; // 0x1010524

    field public static final int foreground = 16843017; // 0x1010109

    field public static final int foregroundGravity = 16843264; // 0x1010200

    field public static final int foregroundTint = 16843885; // 0x101046d
@@ -654,8 +654,8 @@ package android { 
    field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353

    field public static final int horizontalSpacing = 16843028; // 0x1010114

    field public static final int host = 16842792; // 0x1010028

    field public static final int hotSpotX = 16844055; // 0x1010517

    field public static final int hotSpotY = 16844056; // 0x1010518

    field public static final int hotSpotX = 16844056; // 0x1010518

    field public static final int hotSpotY = 16844057; // 0x1010519

    field public static final int hyphenationFrequency = 16843998; // 0x10104de

    field public static final int icon = 16842754; // 0x1010002

    field public static final int iconPreview = 16843337; // 0x1010249
@@ -742,7 +742,7 @@ package android { 
    field public static final int label = 16842753; // 0x1010001

    field public static final int labelFor = 16843718; // 0x10103c6

    field public static final int labelTextSize = 16843317; // 0x1010235

    field public static final int languageTag = 16844040; // 0x1010508

    field public static final int languageTag = 16844041; // 0x1010509

    field public static final int largeHeap = 16843610; // 0x101035a

    field public static final int largeScreens = 16843398; // 0x1010286

    field public static final int largestWidthLimitDp = 16843622; // 0x1010366
@@ -800,7 +800,7 @@ package android { 
    field public static final int layout_y = 16843136; // 0x1010180

    field public static final int left = 16843181; // 0x10101ad

    field public static final int letterSpacing = 16843958; // 0x10104b6

    field public static final int level = 16844032; // 0x1010500

    field public static final int level = 16844033; // 0x1010501

    field public static final int lineSpacingExtra = 16843287; // 0x1010217

    field public static final int lineSpacingMultiplier = 16843288; // 0x1010218

    field public static final int lines = 16843092; // 0x1010154
@@ -833,7 +833,7 @@ package android { 
    field public static final int marqueeRepeatLimit = 16843293; // 0x101021d

    field public static final int matchOrder = 16843855; // 0x101044f

    field public static final int max = 16843062; // 0x1010136

    field public static final int maxButtonHeight = 16844029; // 0x10104fd

    field public static final int maxButtonHeight = 16844030; // 0x10104fe

    field public static final int maxDate = 16843584; // 0x1010340

    field public static final int maxEms = 16843095; // 0x1010157

    field public static final int maxHeight = 16843040; // 0x1010120
@@ -876,25 +876,26 @@ package android { 
    field public static final int navigationMode = 16843471; // 0x10102cf

    field public static final int negativeButtonText = 16843254; // 0x10101f6

    field public static final int nestedScrollingEnabled = 16843830; // 0x1010436

    field public static final int networkSecurityConfig = 16844071; // 0x1010527

    field public static final int networkSecurityConfig = 16844074; // 0x101052a

    field public static final int nextFocusDown = 16842980; // 0x10100e4

    field public static final int nextFocusForward = 16843580; // 0x101033c

    field public static final int nextFocusLeft = 16842977; // 0x10100e1

    field public static final int nextFocusRight = 16842978; // 0x10100e2

    field public static final int nextFocusUp = 16842979; // 0x10100e3

    field public static final int nfcAntennaPositionDrawable = 16844063; // 0x101051f

    field public static final int noHistory = 16843309; // 0x101022d

    field public static final int normalScreens = 16843397; // 0x1010285

    field public static final int notificationTimeout = 16843651; // 0x1010383

    field public static final int numColumns = 16843032; // 0x1010118

    field public static final int numStars = 16843076; // 0x1010144

    field public static final int numberPickerStyle = 16844068; // 0x1010524

    field public static final int numberPickerStyle = 16844071; // 0x1010527

    field public static final int numbersBackgroundColor = 16843938; // 0x10104a2

    field public static final int numbersInnerTextColor = 16844001; // 0x10104e1

    field public static final int numbersSelectorColor = 16843939; // 0x10104a3

    field public static final int numbersTextColor = 16843937; // 0x10104a1

    field public static final deprecated int numeric = 16843109; // 0x1010165

    field public static final int numericShortcut = 16843236; // 0x10101e4

    field public static final int offset = 16844052; // 0x1010514

    field public static final int offset = 16844053; // 0x1010515

    field public static final int onClick = 16843375; // 0x101026f

    field public static final int oneshot = 16843159; // 0x1010197

    field public static final int opacity = 16843550; // 0x101031e
@@ -941,13 +942,13 @@ package android { 
    field public static final deprecated int phoneNumber = 16843111; // 0x1010167

    field public static final int pivotX = 16843189; // 0x10101b5

    field public static final int pivotY = 16843190; // 0x10101b6

    field public static final int pointerIcon = 16844041; // 0x1010509

    field public static final int pointerIcon = 16844042; // 0x101050a

    field public static final int popupAnimationStyle = 16843465; // 0x10102c9

    field public static final int popupBackground = 16843126; // 0x1010176

    field public static final int popupCharacters = 16843332; // 0x1010244

    field public static final int popupElevation = 16843916; // 0x101048c

    field public static final int popupEnterTransition = 16844063; // 0x101051f

    field public static final int popupExitTransition = 16844064; // 0x1010520

    field public static final int popupEnterTransition = 16844065; // 0x1010521

    field public static final int popupExitTransition = 16844066; // 0x1010522

    field public static final int popupKeyboard = 16843331; // 0x1010243

    field public static final int popupLayout = 16843323; // 0x101023b

    field public static final int popupMenuStyle = 16843520; // 0x1010300
@@ -956,7 +957,7 @@ package android { 
    field public static final int port = 16842793; // 0x1010029

    field public static final int positiveButtonText = 16843253; // 0x10101f5

    field public static final int preferenceCategoryStyle = 16842892; // 0x101008c

    field public static final int preferenceFragmentStyle = 16844038; // 0x1010506

    field public static final int preferenceFragmentStyle = 16844039; // 0x1010507

    field public static final int preferenceInformationStyle = 16842893; // 0x101008d

    field public static final int preferenceLayoutChild = 16842900; // 0x1010094

    field public static final int preferenceScreenStyle = 16842891; // 0x101008b
@@ -1024,7 +1025,7 @@ package android { 
    field public static final int resizeClip = 16843983; // 0x10104cf

    field public static final int resizeMode = 16843619; // 0x1010363

    field public static final int resizeable = 16843405; // 0x101028d

    field public static final int resizeableActivity = 16844022; // 0x10104f6

    field public static final int resizeableActivity = 16844023; // 0x10104f7

    field public static final int resource = 16842789; // 0x1010025

    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d
@@ -1144,8 +1145,8 @@ package android { 
    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 int startX = 16844048; // 0x1010510

    field public static final int startY = 16844049; // 0x1010511

    field public static final int startX = 16844049; // 0x1010511

    field public static final int startY = 16844050; // 0x1010512

    field public static final deprecated int startYear = 16843132; // 0x101017c

    field public static final int stateListAnimator = 16843848; // 0x1010448

    field public static final int stateNotNeeded = 16842774; // 0x1010016
@@ -1202,8 +1203,8 @@ package android { 
    field public static final int summaryOn = 16843247; // 0x10101ef

    field public static final int supportsAssist = 16844016; // 0x10104f0

    field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1

    field public static final int supportsLocalInteraction = 16844047; // 0x101050f

    field public static final int supportsPictureInPicture = 16844023; // 0x10104f7

    field public static final int supportsLocalInteraction = 16844048; // 0x1010510

    field public static final int supportsPictureInPicture = 16844024; // 0x10104f8

    field public static final int supportsRtl = 16843695; // 0x10103af

    field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb

    field public static final int supportsUploading = 16843419; // 0x101029b
@@ -1252,7 +1253,7 @@ package android { 
    field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f

    field public static final int textAppearanceMedium = 16842817; // 0x1010041

    field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044

    field public static final int textAppearancePopupMenuHeader = 16844034; // 0x1010502

    field public static final int textAppearancePopupMenuHeader = 16844035; // 0x1010503

    field public static final int textAppearanceSearchResultSubtitle = 16843424; // 0x10102a0

    field public static final int textAppearanceSearchResultTitle = 16843425; // 0x10102a1

    field public static final int textAppearanceSmall = 16842818; // 0x1010042
@@ -1310,9 +1311,9 @@ package android { 
    field public static final int thumbTint = 16843889; // 0x1010471

    field public static final int thumbTintMode = 16843890; // 0x1010472

    field public static final int thumbnail = 16843429; // 0x10102a5

    field public static final int tickMark = 16844042; // 0x101050a

    field public static final int tickMarkTint = 16844043; // 0x101050b

    field public static final int tickMarkTintMode = 16844044; // 0x101050c

    field public static final int tickMark = 16844043; // 0x101050b

    field public static final int tickMarkTint = 16844044; // 0x101050c

    field public static final int tickMarkTintMode = 16844045; // 0x101050d

    field public static final int tileMode = 16843265; // 0x1010201

    field public static final int tileModeX = 16843895; // 0x1010477

    field public static final int tileModeY = 16843896; // 0x1010478
@@ -1324,11 +1325,11 @@ package android { 
    field public static final int tintMode = 16843771; // 0x10103fb

    field public static final int title = 16843233; // 0x10101e1

    field public static final int titleCondensed = 16843234; // 0x10101e2

    field public static final int titleMargin = 16844024; // 0x10104f8

    field public static final int titleMarginBottom = 16844028; // 0x10104fc

    field public static final int titleMarginEnd = 16844026; // 0x10104fa

    field public static final int titleMarginStart = 16844025; // 0x10104f9

    field public static final int titleMarginTop = 16844027; // 0x10104fb

    field public static final int titleMargin = 16844025; // 0x10104f9

    field public static final int titleMarginBottom = 16844029; // 0x10104fd

    field public static final int titleMarginEnd = 16844027; // 0x10104fb

    field public static final int titleMarginStart = 16844026; // 0x10104fa

    field public static final int titleMarginTop = 16844028; // 0x10104fc

    field public static final int titleTextAppearance = 16843822; // 0x101042e

    field public static final int titleTextColor = 16844003; // 0x10104e3

    field public static final int titleTextStyle = 16843512; // 0x10102f8
@@ -1367,7 +1368,7 @@ package android { 
    field public static final int trimPathEnd = 16843785; // 0x1010409

    field public static final int trimPathOffset = 16843786; // 0x101040a

    field public static final int trimPathStart = 16843784; // 0x1010408

    field public static final int tunerCount = 16844061; // 0x101051d

    field public static final int tunerCount = 16844062; // 0x101051e

    field public static final int type = 16843169; // 0x10101a1

    field public static final int typeface = 16842902; // 0x1010096

    field public static final int uiOptions = 16843672; // 0x1010398
@@ -1375,7 +1376,7 @@ package android { 
    field public static final deprecated int unfocusedMonthDateColor = 16843588; // 0x1010344

    field public static final int unselectedAlpha = 16843278; // 0x101020e

    field public static final int updatePeriodMillis = 16843344; // 0x1010250

    field public static final int use32bitAbi = 16844053; // 0x1010515

    field public static final int use32bitAbi = 16844054; // 0x1010516

    field public static final int useDefaultMargins = 16843641; // 0x1010379

    field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310

    field public static final int useLevel = 16843167; // 0x101019f
@@ -1387,7 +1388,7 @@ package android { 
    field public static final int valueType = 16843488; // 0x10102e0

    field public static final int variablePadding = 16843157; // 0x1010195

    field public static final int vendor = 16843751; // 0x10103e7

    field public static final int version = 16844057; // 0x1010519

    field public static final int version = 16844058; // 0x101051a

    field public static final int versionCode = 16843291; // 0x101021b

    field public static final int versionName = 16843292; // 0x101021c

    field public static final int verticalCorrection = 16843322; // 0x101023a
@@ -1431,7 +1432,7 @@ package android { 
    field public static final int windowAllowReturnTransitionOverlap = 16843835; // 0x101043b

    field public static final int windowAnimationStyle = 16842926; // 0x10100ae

    field public static final int windowBackground = 16842836; // 0x1010054

    field public static final int windowBackgroundFallback = 16844035; // 0x1010503

    field public static final int windowBackgroundFallback = 16844036; // 0x1010504

    field public static final int windowClipToOutline = 16843947; // 0x10104ab

    field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b

    field public static final int windowContentOverlay = 16842841; // 0x1010059

api/removed.txt

+19 −0
Original line number Diff line number Diff line 
package android {



  public static final class R.attr {

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

  }



  public static final class R.styleable {

    field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6

    field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5

  }



}



package android.app {



  public class Notification implements android.os.Parcelable {
@@ -454,6 +468,11 @@ package android.widget { 


package com.android.internal {



  public static final class R.attr {

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

  }



  public static final class R.styleable {

    field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6

    field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5

api/system-current.txt

+50 −49

File changed.

Preview size limit exceeded, changes collapsed.

api/system-removed.txt

+19 −0
Original line number Diff line number Diff line 
package android {



  public static final class R.attr {

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

  }



  public static final class R.styleable {

    field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6

    field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5

  }



}



package android.app {



  public class Notification implements android.os.Parcelable {
@@ -452,6 +466,11 @@ package android.widget { 


package com.android.internal {



  public static final class R.attr {

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

  }



  public static final class R.styleable {

    field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6

    field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5

api/test-current.txt

+50 −49

File changed.

Preview size limit exceeded, changes collapsed.