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

Commit 1a9c6c97 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "The wave view attributes should not be public."

parents fd19906b acc3012c

api/current.txt

+31 −45
Original line number Diff line number Diff line
@@ -190,15 +190,15 @@ package android { 
    field public static final int accountPreferences = 16843423; // 0x101029f

    field public static final int accountType = 16843407; // 0x101028f

    field public static final int action = 16842797; // 0x101002d

    field public static final int actionBarDivider = 16843689; // 0x10103a9

    field public static final int actionBarItemBackground = 16843690; // 0x10103aa

    field public static final int actionBarDivider = 16843675; // 0x101039b

    field public static final int actionBarItemBackground = 16843676; // 0x101039c

    field public static final int actionBarSize = 16843499; // 0x10102eb

    field public static final int actionBarSplitStyle = 16843670; // 0x1010396

    field public static final int actionBarSplitStyle = 16843656; // 0x1010388

    field public static final int actionBarStyle = 16843470; // 0x10102ce

    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 actionBarWidgetTheme = 16843685; // 0x10103a5

    field public static final int actionBarWidgetTheme = 16843671; // 0x1010397

    field public static final int actionButtonStyle = 16843480; // 0x10102d8

    field public static final int actionDropDownStyle = 16843479; // 0x10102d7

    field public static final int actionLayout = 16843515; // 0x10102fb
@@ -211,10 +211,10 @@ package android { 
    field public static final int actionModeCutDrawable = 16843537; // 0x1010311

    field public static final int actionModePasteDrawable = 16843539; // 0x1010313

    field public static final int actionModeSelectAllDrawable = 16843646; // 0x101037e

    field public static final int actionModeSplitBackground = 16843691; // 0x10103ab

    field public static final int actionModeStyle = 16843682; // 0x10103a2

    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 actionProviderClass = 16843671; // 0x1010397

    field public static final int actionProviderClass = 16843657; // 0x1010389

    field public static final int actionViewClass = 16843516; // 0x10102fc

    field public static final int activatedBackgroundIndicator = 16843517; // 0x10102fd

    field public static final int activityCloseEnterAnimation = 16842938; // 0x10100ba
@@ -260,8 +260,8 @@ package android { 
    field public static final int background = 16842964; // 0x10100d4

    field public static final int backgroundDimAmount = 16842802; // 0x1010032

    field public static final int backgroundDimEnabled = 16843295; // 0x101021f

    field public static final int backgroundSplit = 16843673; // 0x1010399

    field public static final int backgroundStacked = 16843672; // 0x1010398

    field public static final int backgroundSplit = 16843659; // 0x101038b

    field public static final int backgroundStacked = 16843658; // 0x101038a

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

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

    field public static final int baselineAlignBottom = 16843042; // 0x1010122
@@ -270,7 +270,6 @@ package android { 
    field public static final int borderlessButtonStyle = 16843563; // 0x101032b

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

    field public static final int bottomBright = 16842957; // 0x10100cd

    field public static final int bottomChevronDrawable = 16843659; // 0x101038b

    field public static final int bottomDark = 16842953; // 0x10100c9

    field public static final int bottomLeftRadius = 16843179; // 0x10101ab

    field public static final int bottomMedium = 16842958; // 0x10100ce
@@ -318,15 +317,15 @@ 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 colorActivatedHighlight = 16843678; // 0x101039e

    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 colorFocusedHighlight = 16843677; // 0x101039d

    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 = 16843676; // 0x101039c

    field public static final int colorMultiSelectHighlight = 16843679; // 0x101039f

    field public static final int colorPressedHighlight = 16843675; // 0x101039b

    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 columnCount = 16843639; // 0x1010377

    field public static final int columnDelay = 16843215; // 0x10101cf

    field public static final int columnOrderPreserved = 16843640; // 0x1010378
@@ -370,7 +369,7 @@ package android { 
    field public static final int dialogTitle = 16843250; // 0x10101f2

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

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

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

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

    field public static final int directionPriority = 16843218; // 0x10101d2

    field public static final int disableDependentsState = 16843249; // 0x10101f1

    field public static final int disabledAlpha = 16842803; // 0x1010033
@@ -384,11 +383,11 @@ package android { 
    field public static final int drawSelectorOnTop = 16843004; // 0x10100fc

    field public static final int drawable = 16843161; // 0x1010199

    field public static final int drawableBottom = 16843118; // 0x101016e

    field public static final int drawableEnd = 16843681; // 0x10103a1

    field public static final int drawableEnd = 16843667; // 0x1010393

    field public static final int drawableLeft = 16843119; // 0x101016f

    field public static final int drawablePadding = 16843121; // 0x1010171

    field public static final int drawableRight = 16843120; // 0x1010170

    field public static final int drawableStart = 16843680; // 0x10103a0

    field public static final int drawableStart = 16843666; // 0x1010392

    field public static final int drawableTop = 16843117; // 0x101016d

    field public static final int drawingCacheQuality = 16842984; // 0x10100e8

    field public static final int dropDownAnchor = 16843363; // 0x1010263
@@ -445,7 +444,6 @@ package android { 
    field public static final int fastScrollTextColor = 16843609; // 0x1010359

    field public static final int fastScrollThumbDrawable = 16843574; // 0x1010336

    field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339

    field public static final int feedbackCount = 16843665; // 0x1010391

    field public static final int fillAfter = 16843197; // 0x10101bd

    field public static final int fillBefore = 16843196; // 0x10101bc

    field public static final int fillEnabled = 16843343; // 0x101024f
@@ -498,7 +496,6 @@ package android { 
    field public static final int hand_hour = 16843011; // 0x1010103

    field public static final int hand_minute = 16843012; // 0x1010104

    field public static final int handle = 16843354; // 0x101025a

    field public static final int handleDrawable = 16843655; // 0x1010387

    field public static final int handleProfiling = 16842786; // 0x1010022

    field public static final int hapticFeedbackEnabled = 16843358; // 0x101025e

    field public static final int hardwareAccelerated = 16843475; // 0x10102d3
@@ -507,12 +504,10 @@ package android { 
    field public static final int headerDividersEnabled = 16843310; // 0x101022e

    field public static final int height = 16843093; // 0x1010155

    field public static final int hint = 16843088; // 0x1010150

    field public static final int hitRadius = 16843662; // 0x101038e

    field public static final int homeAsUpIndicator = 16843531; // 0x101030b

    field public static final int homeLayout = 16843549; // 0x101031d

    field public static final int horizontalDivider = 16843053; // 0x101012d

    field public static final int horizontalGap = 16843327; // 0x101023f

    field public static final int horizontalOffset = 16843667; // 0x1010393

    field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353

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

    field public static final int host = 16842792; // 0x1010028
@@ -630,7 +625,6 @@ package android { 
    field public static final int layout_x = 16843135; // 0x101017f

    field public static final int layout_y = 16843136; // 0x1010180

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

    field public static final int leftChevronDrawable = 16843656; // 0x1010388

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

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

    field public static final int lines = 16843092; // 0x1010154
@@ -642,10 +636,10 @@ package android { 
    field public static final int listDividerAlertDialog = 16843525; // 0x1010305

    field public static final int listPopupWindowStyle = 16843519; // 0x10102ff

    field public static final int listPreferredItemHeight = 16842829; // 0x101004d

    field public static final int listPreferredItemHeightLarge = 16843668; // 0x1010394

    field public static final int listPreferredItemHeightSmall = 16843669; // 0x1010395

    field public static final int listPreferredItemPaddingLeft = 16843697; // 0x10103b1

    field public static final int listPreferredItemPaddingRight = 16843698; // 0x10103b2

    field public static final int listPreferredItemHeightLarge = 16843654; // 0x1010386

    field public static final int listPreferredItemHeightSmall = 16843655; // 0x1010387

    field public static final int listPreferredItemPaddingLeft = 16843683; // 0x10103a3

    field public static final int listPreferredItemPaddingRight = 16843684; // 0x10103a4

    field public static final int listSelector = 16843003; // 0x10100fb

    field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208

    field public static final int listViewStyle = 16842868; // 0x1010074
@@ -676,8 +670,8 @@ package android { 
    field public static final int minHeight = 16843072; // 0x1010140

    field public static final int minLevel = 16843185; // 0x10101b1

    field public static final int minLines = 16843094; // 0x1010156

    field public static final int minResizeHeight = 16843684; // 0x10103a4

    field public static final int minResizeWidth = 16843683; // 0x10103a3

    field public static final int minResizeHeight = 16843670; // 0x1010396

    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int mode = 16843134; // 0x101017e
@@ -707,11 +701,10 @@ package android { 
    field public static final int orderingFromXml = 16843239; // 0x10101e7

    field public static final int orientation = 16842948; // 0x10100c4

    field public static final int outAnimation = 16843128; // 0x1010178

    field public static final int outerRadius = 16843661; // 0x101038d

    field public static final int overScrollFooter = 16843459; // 0x10102c3

    field public static final int overScrollHeader = 16843458; // 0x10102c2

    field public static final int overScrollMode = 16843457; // 0x10102c1

    field public static final int overridesImplicitlyEnabledSubtype = 16843696; // 0x10103b0

    field public static final int overridesImplicitlyEnabledSubtype = 16843682; // 0x10103a2

    field public static final int packageNames = 16843649; // 0x1010381

    field public static final int padding = 16842965; // 0x10100d5

    field public static final int paddingBottom = 16842969; // 0x10100d9
@@ -798,7 +791,6 @@ package android { 
    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d

    field public static final int right = 16843183; // 0x10101af

    field public static final int rightChevronDrawable = 16843657; // 0x1010389

    field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093

    field public static final int ringtoneType = 16843257; // 0x10101f9

    field public static final int rotation = 16843558; // 0x1010326
@@ -874,7 +866,6 @@ package android { 
    field public static final int smallIcon = 16843422; // 0x101029e

    field public static final int smallScreens = 16843396; // 0x1010284

    field public static final int smoothScrollbar = 16843313; // 0x1010231

    field public static final int snapMargin = 16843664; // 0x1010390

    field public static final int soundEffectsEnabled = 16843285; // 0x1010215

    field public static final int spacing = 16843027; // 0x1010113

    field public static final int spinnerDropDownItemStyle = 16842887; // 0x1010087
@@ -920,8 +911,8 @@ package android { 
    field public static final int stretchMode = 16843030; // 0x1010116

    field public static final int subtitle = 16843473; // 0x10102d1

    field public static final int subtitleTextStyle = 16843513; // 0x10102f9

    field public static final int subtypeExtraValue = 16843688; // 0x10103a8

    field public static final int subtypeLocale = 16843687; // 0x10103a7

    field public static final int subtypeExtraValue = 16843674; // 0x101039a

    field public static final int subtypeLocale = 16843673; // 0x1010399

    field public static final int suggestActionMsg = 16843228; // 0x10101dc

    field public static final int suggestActionMsgColumn = 16843229; // 0x10101dd

    field public static final int summary = 16843241; // 0x10101e9
@@ -943,8 +934,7 @@ package android { 
    field public static final int tag = 16842961; // 0x10100d1

    field public static final int targetActivity = 16843266; // 0x1010202

    field public static final int targetClass = 16842799; // 0x101002f

    field public static final int targetDescriptions = 16843694; // 0x10103ae

    field public static final int targetDrawables = 16843654; // 0x1010386

    field public static final int targetDescriptions = 16843680; // 0x10103a0

    field public static final int targetPackage = 16842785; // 0x1010021

    field public static final int targetSdkVersion = 16843376; // 0x1010270

    field public static final int taskAffinity = 16842770; // 0x1010012
@@ -959,15 +949,15 @@ package android { 
    field public static final int tension = 16843370; // 0x101026a

    field public static final int testOnly = 16843378; // 0x1010272

    field public static final int text = 16843087; // 0x101014f

    field public static final int textAllCaps = 16843674; // 0x101039a

    field public static final int textAllCaps = 16843660; // 0x101038c

    field public static final int textAppearance = 16842804; // 0x1010034

    field public static final int textAppearanceButton = 16843271; // 0x1010207

    field public static final int textAppearanceInverse = 16842805; // 0x1010035

    field public static final int textAppearanceLarge = 16842816; // 0x1010040

    field public static final int textAppearanceLargeInverse = 16842819; // 0x1010043

    field public static final int textAppearanceLargePopupMenu = 16843521; // 0x1010301

    field public static final int textAppearanceListItem = 16843692; // 0x10103ac

    field public static final int textAppearanceListItemSmall = 16843693; // 0x10103ad

    field public static final int textAppearanceListItem = 16843678; // 0x101039e

    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 textAppearanceSearchResultSubtitle = 16843424; // 0x10102a0
@@ -1036,7 +1026,6 @@ package android { 
    field public static final int toYScale = 16843205; // 0x10101c5

    field public static final int top = 16843182; // 0x10101ae

    field public static final int topBright = 16842955; // 0x10100cb

    field public static final int topChevronDrawable = 16843658; // 0x101038a

    field public static final int topDark = 16842951; // 0x10100c7

    field public static final int topLeftRadius = 16843177; // 0x10101a9

    field public static final int topOffset = 16843352; // 0x1010258
@@ -1049,7 +1038,7 @@ package android { 
    field public static final int translationY = 16843555; // 0x1010323

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

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

    field public static final int uiOptions = 16843686; // 0x10103a6

    field public static final int uiOptions = 16843672; // 0x1010398

    field public static final int uncertainGestureColor = 16843382; // 0x1010276

    field public static final int unfocusedMonthDateColor = 16843588; // 0x1010344

    field public static final int unselectedAlpha = 16843278; // 0x101020e
@@ -1068,10 +1057,8 @@ package android { 
    field public static final int verticalCorrection = 16843322; // 0x101023a

    field public static final int verticalDivider = 16843054; // 0x101012e

    field public static final int verticalGap = 16843328; // 0x1010240

    field public static final int verticalOffset = 16843666; // 0x1010392

    field public static final int verticalScrollbarPosition = 16843572; // 0x1010334

    field public static final int verticalSpacing = 16843029; // 0x1010115

    field public static final int vibrationDuration = 16843663; // 0x101038f

    field public static final int visibility = 16842972; // 0x10100dc

    field public static final int visible = 16843156; // 0x1010194

    field public static final int vmSafeMode = 16843448; // 0x10102b8
@@ -1088,7 +1075,6 @@ package android { 
    field public static final int wallpaperIntraOpenExitAnimation = 16843416; // 0x1010298

    field public static final int wallpaperOpenEnterAnimation = 16843411; // 0x1010293

    field public static final int wallpaperOpenExitAnimation = 16843412; // 0x1010294

    field public static final int waveDrawable = 16843660; // 0x101038c

    field public static final int webTextViewStyle = 16843449; // 0x10102b9

    field public static final int webViewStyle = 16842885; // 0x1010085

    field public static final int weekDayTextAppearance = 16843592; // 0x1010348

core/res/res/values/public.xml

+0 −14
Original line number Diff line number Diff line
@@ -1745,20 +1745,6 @@ 
  <public type="attr" name="accessibilityFlags" />

  <public type="attr" name="canRetrieveWindowContent" />



  <public type="attr" name="targetDrawables" />

  <public type="attr" name="handleDrawable" />

  <public type="attr" name="leftChevronDrawable" />

  <public type="attr" name="rightChevronDrawable" />

  <public type="attr" name="topChevronDrawable" />

  <public type="attr" name="bottomChevronDrawable" />

  <public type="attr" name="waveDrawable" />

  <public type="attr" name="outerRadius" />

  <public type="attr" name="hitRadius" />

  <public type="attr" name="vibrationDuration" />

  <public type="attr" name="snapMargin" />

  <public type="attr" name="feedbackCount" />

  <public type="attr" name="verticalOffset" />

  <public type="attr" name="horizontalOffset" />

  <public type="attr" name="listPreferredItemHeightLarge" />

  <public type="attr" name="listPreferredItemHeightSmall" />