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

Commit 9f73de85 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi Committed by Automerger Merge Worker
Browse files

Merge changes from topic "Tiramisu-SDK-Finalization" into tm-dev am: ec8a9336 am: 70d2fb7a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17699093



Change-Id: I01edcc65525aae33ddac476ef0ad5c29001e0815
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9371cc49 70d2fb7a

core/api/current.txt

+39 −39
Original line number Diff line number Diff line
@@ -335,15 +335,15 @@ package android { 
    field public static final int allowClearUserData = 16842757; // 0x1010005

    field public static final int allowClickWhenDisabled = 16844312; // 0x1010618

    field public static final int allowEmbedded = 16843765; // 0x10103f5

    field public static final int allowGameAngleDriver;

    field public static final int allowGameDownscaling;

    field public static final int allowGameFpsOverride;

    field public static final int allowGameAngleDriver = 16844376; // 0x1010658

    field public static final int allowGameDownscaling = 16844377; // 0x1010659

    field public static final int allowGameFpsOverride = 16844378; // 0x101065a

    field public static final int allowNativeHeapPointerTagging = 16844306; // 0x1010612

    field public static final int allowParallelSyncs = 16843570; // 0x1010332

    field public static final int allowSingleTap = 16843353; // 0x1010259

    field public static final int allowTaskReparenting = 16843268; // 0x1010204

    field public static final int allowUndo = 16843999; // 0x10104df

    field public static final int allowUntrustedActivityEmbedding;

    field public static final int allowUntrustedActivityEmbedding = 16844393; // 0x1010669

    field public static final int alpha = 16843551; // 0x101031f

    field public static final int alphabeticModifiers = 16844110; // 0x101054e

    field public static final int alphabeticShortcut = 16843235; // 0x10101e3
@@ -374,7 +374,7 @@ package android { 
    field public static final int authorities = 16842776; // 0x1010018

    field public static final int autoAdvanceViewId = 16843535; // 0x101030f

    field public static final int autoCompleteTextViewStyle = 16842859; // 0x101006b

    field public static final int autoHandwritingEnabled;

    field public static final int autoHandwritingEnabled = 16844382; // 0x101065e

    field public static final int autoLink = 16842928; // 0x10100b0

    field public static final int autoMirrored = 16843754; // 0x10103ea

    field public static final int autoRemoveFromRecents = 16843847; // 0x1010447
@@ -390,7 +390,7 @@ package android { 
    field public static final int autoVerify = 16844014; // 0x10104ee

    field public static final int autofillHints = 16844118; // 0x1010556

    field public static final int autofilledHighlight = 16844136; // 0x1010568

    field public static final int backdropColor;

    field public static final int backdropColor = 16844402; // 0x1010672

    field public static final int background = 16842964; // 0x10100d4

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

    field public static final int backgroundDimEnabled = 16843295; // 0x101021f
@@ -437,7 +437,7 @@ package android { 
    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 canDisplayOnRemoteDevices;

    field public static final int canDisplayOnRemoteDevices = 16844368; // 0x1010650

    field public static final int canPauseRecording = 16844314; // 0x101061a

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

    field public static final int canRecord = 16844060; // 0x101051c
@@ -632,7 +632,7 @@ 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 enableOnBackInvokedCallback;

    field public static final int enableOnBackInvokedCallback = 16844396; // 0x101066c

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

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

    field public static final int end = 16843996; // 0x10104dc
@@ -744,10 +744,10 @@ 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 fromExtendBottom;

    field public static final int fromExtendLeft;

    field public static final int fromExtendRight;

    field public static final int fromExtendTop;

    field public static final int fromExtendBottom = 16844386; // 0x1010662

    field public static final int fromExtendLeft = 16844383; // 0x101065f

    field public static final int fromExtendRight = 16844385; // 0x1010661

    field public static final int fromExtendTop = 16844384; // 0x1010660

    field public static final int fromId = 16843850; // 0x101044a

    field public static final int fromScene = 16843741; // 0x10103dd

    field public static final int fromXDelta = 16843206; // 0x10101c6
@@ -867,7 +867,7 @@ package android { 
    field public static final int installLocation = 16843447; // 0x10102b7

    field public static final int interactiveUiTimeout = 16844181; // 0x1010595

    field public static final int interpolator = 16843073; // 0x1010141

    field public static final int intro;

    field public static final int intro = 16844395; // 0x101066b

    field public static final int isAccessibilityTool = 16844353; // 0x1010641

    field public static final int isAlwaysSyncable = 16843571; // 0x1010333

    field public static final int isAsciiCapable = 16843753; // 0x10103e9
@@ -910,7 +910,7 @@ package android { 
    field public static final int keyboardNavigationCluster = 16844096; // 0x1010540

    field public static final int keycode = 16842949; // 0x10100c5

    field public static final int killAfterRestore = 16843420; // 0x101029c

    field public static final int knownActivityEmbeddingCerts;

    field public static final int knownActivityEmbeddingCerts = 16844394; // 0x101066a

    field public static final int knownCerts = 16844330; // 0x101062a

    field public static final int lStar = 16844359; // 0x1010647

    field public static final int label = 16842753; // 0x1010001
@@ -978,8 +978,8 @@ package android { 
    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 lineBreakStyle;

    field public static final int lineBreakWordStyle;

    field public static final int lineBreakStyle = 16844398; // 0x101066e

    field public static final int lineBreakWordStyle = 16844399; // 0x101066f

    field public static final int lineHeight = 16844159; // 0x101057f

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

    field public static final int lineSpacingMultiplier = 16843288; // 0x1010218
@@ -1003,7 +1003,7 @@ package android { 
    field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208

    field public static final int listViewStyle = 16842868; // 0x1010074

    field public static final int listViewWhiteStyle = 16842869; // 0x1010075

    field public static final int localeConfig;

    field public static final int localeConfig = 16844379; // 0x101065b

    field public static final int lockTaskMode = 16844013; // 0x10104ed

    field public static final int logo = 16843454; // 0x10102be

    field public static final int logoDescription = 16844009; // 0x10104e9
@@ -1162,7 +1162,7 @@ package android { 
    field public static final int popupWindowStyle = 16842870; // 0x1010076

    field public static final int port = 16842793; // 0x1010029

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

    field public static final int preferKeepClear;

    field public static final int preferKeepClear = 16844381; // 0x101065d

    field public static final int preferMinimalPostProcessing = 16844300; // 0x101060c

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

    field public static final int preferenceFragmentStyle = 16844038; // 0x1010506
@@ -1238,10 +1238,10 @@ package android { 
    field public static final int requiredFeature = 16844116; // 0x1010554

    field public static final int requiredForAllUsers = 16843728; // 0x10103d0

    field public static final int requiredNotFeature = 16844117; // 0x1010555

    field public static final int requiredSplitTypes;

    field public static final int requiredSplitTypes = 16844366; // 0x101064e

    field public static final int requiresFadingEdge = 16843685; // 0x10103a5

    field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364

    field public static final int resetEnabledSettingsOnAppDataCleared;

    field public static final int resetEnabledSettingsOnAppDataCleared = 16844370; // 0x1010652

    field public static final int resizeClip = 16843983; // 0x10104cf

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

    field public static final int resizeable = 16843405; // 0x101028d
@@ -1337,7 +1337,7 @@ package android { 
    field public static final int shareInterpolator = 16843195; // 0x10101bb

    field @Deprecated public static final int sharedUserId = 16842763; // 0x101000b

    field @Deprecated public static final int sharedUserLabel = 16843361; // 0x1010261

    field public static final int sharedUserMaxSdkVersion;

    field public static final int sharedUserMaxSdkVersion = 16844365; // 0x101064d

    field public static final int shell = 16844180; // 0x1010594

    field public static final int shortcutDisabledMessage = 16844075; // 0x101052b

    field public static final int shortcutId = 16844072; // 0x1010528
@@ -1346,8 +1346,8 @@ package android { 
    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int shouldUseDefaultUnfoldTransition = 16844364; // 0x101064c

    field public static final int showAsAction = 16843481; // 0x10102d9

    field public static final int showBackdrop;

    field public static final int showClockAndComplications;

    field public static final int showBackdrop = 16844380; // 0x101065c

    field public static final int showClockAndComplications = 16844372; // 0x1010654

    field public static final int showDefault = 16843258; // 0x10101fa

    field public static final int showDividers = 16843561; // 0x1010329

    field public static final int showForAllUsers = 16844015; // 0x10104ef
@@ -1378,7 +1378,7 @@ package android { 
    field public static final int splitMotionEvents = 16843503; // 0x10102ef

    field public static final int splitName = 16844105; // 0x1010549

    field public static final int splitTrack = 16843852; // 0x101044c

    field public static final int splitTypes;

    field public static final int splitTypes = 16844367; // 0x101064f

    field public static final int spotShadowAlpha = 16843967; // 0x10104bf

    field public static final int src = 16843033; // 0x1010119

    field public static final int ssp = 16843747; // 0x10103e3
@@ -1449,18 +1449,18 @@ package android { 
    field public static final int summaryColumn = 16843426; // 0x10102a2

    field public static final int summaryOff = 16843248; // 0x10101f0

    field public static final int summaryOn = 16843247; // 0x10101ef

    field public static final int supportedTypes;

    field public static final int supportedTypes = 16844369; // 0x1010651

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

    field public static final int supportsBatteryGameMode;

    field public static final int supportsBatteryGameMode = 16844374; // 0x1010656

    field public static final int supportsInlineSuggestions = 16844301; // 0x101060d

    field public static final int supportsInlineSuggestionsWithTouchExploration;

    field public static final int supportsInlineSuggestionsWithTouchExploration = 16844397; // 0x101066d

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

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

    field public static final int supportsMultipleDisplays = 16844182; // 0x1010596

    field public static final int supportsPerformanceGameMode;

    field public static final int supportsPerformanceGameMode = 16844375; // 0x1010657

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

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

    field public static final int supportsStylusHandwriting;

    field public static final int supportsStylusHandwriting = 16844371; // 0x1010653

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

    field public static final int supportsUploading = 16843419; // 0x101029b

    field public static final int suppressesSpellChecker = 16844355; // 0x1010643
@@ -1579,7 +1579,7 @@ package android { 
    field public static final int tileMode = 16843265; // 0x1010201

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

    field public static final int tileModeY = 16843896; // 0x1010478

    field public static final int tileService;

    field public static final int tileService = 16844391; // 0x1010667

    field public static final int timePickerDialogTheme = 16843934; // 0x101049e

    field public static final int timePickerMode = 16843956; // 0x10104b4

    field public static final int timePickerStyle = 16843933; // 0x101049d
@@ -1598,10 +1598,10 @@ package android { 
    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 toExtendBottom;

    field public static final int toExtendLeft;

    field public static final int toExtendRight;

    field public static final int toExtendTop;

    field public static final int toExtendBottom = 16844390; // 0x1010666

    field public static final int toExtendLeft = 16844387; // 0x1010663

    field public static final int toExtendRight = 16844389; // 0x1010665

    field public static final int toExtendTop = 16844388; // 0x1010664

    field public static final int toId = 16843849; // 0x1010449

    field public static final int toScene = 16843742; // 0x10103de

    field public static final int toXDelta = 16843207; // 0x10101c7
@@ -1753,7 +1753,7 @@ package android { 
    field public static final int windowSplashScreenAnimatedIcon = 16844333; // 0x101062d

    field @Deprecated public static final int windowSplashScreenAnimationDuration = 16844334; // 0x101062e

    field public static final int windowSplashScreenBackground = 16844332; // 0x101062c

    field public static final int windowSplashScreenBehavior;

    field public static final int windowSplashScreenBehavior = 16844392; // 0x1010668

    field public static final int windowSplashScreenBrandingImage = 16844335; // 0x101062f

    field public static final int windowSplashScreenIconBackgroundColor = 16844336; // 0x1010630

    field @Deprecated public static final int windowSplashscreenContent = 16844132; // 0x1010564
@@ -2092,7 +2092,7 @@ package android { 
    field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038

    field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d

    field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036

    field public static final int accessibilityActionShowTextSuggestions;

    field public static final int accessibilityActionShowTextSuggestions = 16908376; // 0x1020058

    field public static final int accessibilityActionShowTooltip = 16908356; // 0x1020044

    field public static final int accessibilitySystemActionBack = 16908363; // 0x102004b

    field public static final int accessibilitySystemActionHome = 16908364; // 0x102004c
@@ -2128,8 +2128,8 @@ package android { 
    field public static final int icon_frame = 16908350; // 0x102003e

    field public static final int input = 16908297; // 0x1020009

    field public static final int inputArea = 16908318; // 0x102001e

    field public static final int inputExtractAccessories;

    field public static final int inputExtractAction;

    field public static final int inputExtractAccessories = 16908378; // 0x102005a

    field public static final int inputExtractAction = 16908377; // 0x1020059

    field public static final int inputExtractEditText = 16908325; // 0x1020025

    field @Deprecated public static final int keyboardView = 16908326; // 0x1020026

    field public static final int list = 16908298; // 0x102000a
@@ -2301,7 +2301,7 @@ package android { 
    field public static final int TextAppearance = 16973886; // 0x103003e

    field public static final int TextAppearance_DeviceDefault = 16974253; // 0x10301ad

    field public static final int TextAppearance_DeviceDefault_DialogWindowTitle = 16974264; // 0x10301b8

    field public static final int TextAppearance_DeviceDefault_Headline;

    field public static final int TextAppearance_DeviceDefault_Headline = 16974565; // 0x10302e5

    field public static final int TextAppearance_DeviceDefault_Inverse = 16974254; // 0x10301ae

    field public static final int TextAppearance_DeviceDefault_Large = 16974255; // 0x10301af

    field public static final int TextAppearance_DeviceDefault_Large_Inverse = 16974256; // 0x10301b0

core/api/system-current.txt

+11 −11
Original line number Diff line number Diff line
@@ -367,12 +367,12 @@ package android { 














  public static final class R.array {















    field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005













    field public static final int config_optionalIpSecAlgorithms;













    field public static final int config_optionalIpSecAlgorithms = 17235974; // 0x1070006















  }





























  public static final class R.attr {















    field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600













    field public static final int gameSessionService;













    field public static final int gameSessionService = 16844373; // 0x1010655















    field public static final int hotwordDetectionService = 16844326; // 0x1010626















    field public static final int isVrOnly = 16844152; // 0x1010578















    field public static final int minExtensionVersion = 16844305; // 0x1010611









@@ -385,7 +385,7 @@ package android {













  }





























  public static final class R.bool {













    field public static final int config_enableQrCodeScannerOnLockScreen;













    field public static final int config_enableQrCodeScannerOnLockScreen = 17891336; // 0x1110008















    field public static final int config_sendPackageName = 17891328; // 0x1110000















    field public static final int config_showDefaultAssistant = 17891329; // 0x1110001















    field public static final int config_showDefaultEmergency = 17891330; // 0x1110002









@@ -402,7 +402,7 @@ package android {



























  public static final class R.drawable {















    field public static final int ic_info = 17301684; // 0x10800b4













    field public static final int ic_safety_protection;













    field public static final int ic_safety_protection = 17301685; // 0x10800b5















  }





























  public static final class R.raw {









@@ -414,13 +414,13 @@ package android {













    field public static final int config_customMediaKeyDispatcher = 17039404; // 0x104002c















    field public static final int config_customMediaSessionPolicyProvider = 17039405; // 0x104002d















    field public static final int config_defaultAssistant = 17039393; // 0x1040021













    field public static final int config_defaultAutomotiveNavigation;













    field public static final int config_defaultAutomotiveNavigation = 17039424; // 0x1040040















    field public static final int config_defaultBrowser = 17039394; // 0x1040022















    field public static final int config_defaultCallRedirection = 17039397; // 0x1040025















    field public static final int config_defaultCallScreening = 17039398; // 0x1040026















    field public static final int config_defaultDialer = 17039395; // 0x1040023















    field public static final int config_defaultSms = 17039396; // 0x1040024













    field public static final int config_devicePolicyManagement;













    field public static final int config_devicePolicyManagement = 17039421; // 0x104003d















    field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f















    field public static final int config_feedbackIntentNameKey = 17039392; // 0x1040020















    field public static final int config_helpIntentExtraKey = 17039389; // 0x104001d









@@ -429,19 +429,19 @@ package android {













    field public static final int config_helpPackageNameValue = 17039388; // 0x104001c















    field public static final int config_systemActivityRecognizer = 17039416; // 0x1040038















    field public static final int config_systemAmbientAudioIntelligence = 17039411; // 0x1040033













    field public static final int config_systemAppProtectionService;













    field public static final int config_systemAppProtectionService = 17039422; // 0x104003e















    field public static final int config_systemAudioIntelligence = 17039412; // 0x1040034













    field public static final int config_systemAutomotiveCalendarSyncManager;













    field public static final int config_systemAutomotiveCalendarSyncManager = 17039423; // 0x104003f















    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028















    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029















    field public static final int config_systemCompanionDeviceProvider = 17039417; // 0x1040039















    field public static final int config_systemContacts = 17039403; // 0x104002b















    field public static final int config_systemGallery = 17039399; // 0x1040027















    field public static final int config_systemNotificationIntelligence = 17039413; // 0x1040035













    field public static final int config_systemSettingsIntelligence;













    field public static final int config_systemSettingsIntelligence = 17039426; // 0x1040042















    field public static final int config_systemShell = 17039402; // 0x104002a















    field public static final int config_systemSpeechRecognizer = 17039406; // 0x104002e













    field public static final int config_systemSupervision;













    field public static final int config_systemSupervision = 17039420; // 0x104003c















    field public static final int config_systemTelevisionNotificationHandler = 17039409; // 0x1040031















    field public static final int config_systemTextIntelligence = 17039414; // 0x1040036















    field public static final int config_systemUi = 17039418; // 0x104003a









@@ -449,7 +449,7 @@ package android {













    field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037















    field public static final int config_systemWellbeing = 17039408; // 0x1040030















    field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f













    field public static final int safety_protection_display_text;













    field public static final int safety_protection_display_text = 17039425; // 0x1040041















  }





























  public static final class R.style {

























core/api/test-current.txt



+2
−2






























Original line number
Diff line number
Diff line








@@ -63,14 +63,14 @@ package android {













  public static final class R.bool {















    field public static final int config_assistantOnTopOfDream = 17891333; // 0x1110005















    field public static final int config_perDisplayFocusEnabled = 17891332; // 0x1110004













    field public static final int config_preventImeStartupUnlessTextEditor;













    field public static final int config_preventImeStartupUnlessTextEditor = 17891335; // 0x1110007















    field public static final int config_remoteInsetsControllerControlsSystemBars = 17891334; // 0x1110006















  }































  public static final class R.string {















    field public static final int config_defaultAssistant = 17039393; // 0x1040021















    field public static final int config_defaultDialer = 17039395; // 0x1040023













    field public static final int config_systemAutomotiveCalendarSyncManager;













    field public static final int config_systemAutomotiveCalendarSyncManager = 17039423; // 0x104003f















    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028















    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029















    field public static final int config_systemGallery = 17039399; // 0x1040027

































core/res/res/values/public-final.xml



+180
−0




























File changed.
Preview size limit exceeded, changes collapsed.
























core/res/res/values/public-staging.xml



+19
−94




























File changed.
Preview size limit exceeded, changes collapsed.