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

Commit 7fa5818f authored by Michael Wright's avatar Michael Wright
Browse files

Reapply "Finalize resources for VIC" 

This reverts commit 111380a1.

Instead of listing the resources twice, just mark the original ones as
removed. This will break any existing clients of the APIs until they
recompile, but given that flags weren't accesible to application for
most of this release (and still aren't available to most apps), this
should have minimal-to-no impact in practice.

Bug: 335304236
Test: atest --host  WearSdkRoboTests:WearSdkVersionTest
Change-Id: I7998a1f28e51e40e911ce6d51412232714993a84
parent bfe475e6

core/api/current.txt

+39 −39
Original line number Diff line number Diff line
@@ -451,12 +451,12 @@ package android { 
    field public static final int alertDialogTheme = 16843529; // 0x1010309

    field public static final int alignmentMode = 16843642; // 0x101037a

    field public static final int allContactsName = 16843468; // 0x10102cc

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int allow;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int allow = 16844430; // 0x101068e

    field public static final int allowAudioPlaybackCapture = 16844289; // 0x1010601

    field public static final int allowBackup = 16843392; // 0x1010280

    field public static final int allowClearUserData = 16842757; // 0x1010005

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

    field @FlaggedApi("android.security.asm_restrictions_enabled") public static final int allowCrossUidActivitySwitchFromBelow;

    field @FlaggedApi("android.security.asm_restrictions_enabled") public static final int allowCrossUidActivitySwitchFromBelow = 16844449; // 0x10106a1

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

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

    field public static final int allowGameDownscaling = 16844377; // 0x1010659
@@ -511,7 +511,7 @@ package android { 
    field public static final int autoSizeTextType = 16844085; // 0x1010535

    field public static final int autoStart = 16843445; // 0x10102b5

    field @Deprecated public static final int autoText = 16843114; // 0x101016a

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final int autoTransact;

    field @FlaggedApi("android.nfc.nfc_read_polling_loop") public static final int autoTransact = 16844441; // 0x1010699

    field public static final int autoUrlDetect = 16843404; // 0x101028c

    field public static final int autoVerify = 16844014; // 0x10104ee

    field public static final int autofillHints = 16844118; // 0x1010556
@@ -658,7 +658,7 @@ package android { 
    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 @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public static final int contentSensitivity;

    field @FlaggedApi("android.view.flags.sensitive_content_app_protection_api") public static final int contentSensitivity = 16844446; // 0x101069e

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

    field public static final int contextDescription = 16844078; // 0x101052e

    field public static final int contextPopupMenuStyle = 16844033; // 0x1010501
@@ -688,7 +688,7 @@ package android { 
    field public static final int debuggable = 16842767; // 0x101000f

    field public static final int defaultFocusHighlightEnabled = 16844130; // 0x1010562

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

    field @FlaggedApi("android.content.res.default_locale") public static final int defaultLocale;

    field @FlaggedApi("android.content.res.default_locale") public static final int defaultLocale = 16844424; // 0x1010688

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

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

    field public static final int defaultWidth = 16844020; // 0x10104f4
@@ -858,7 +858,7 @@ package android { 
    field public static final int format24Hour = 16843723; // 0x10103cb

    field public static final int fraction = 16843992; // 0x10104d8

    field public static final int fragment = 16843491; // 0x10102e3

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int fragmentAdvancedPattern;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int fragmentAdvancedPattern = 16844438; // 0x1010696

    field public static final int fragmentAllowEnterTransitionOverlap = 16843976; // 0x10104c8

    field public static final int fragmentAllowReturnTransitionOverlap = 16843977; // 0x10104c9

    field public static final int fragmentCloseEnterAnimation = 16843495; // 0x10102e7
@@ -869,13 +869,13 @@ package android { 
    field public static final int fragmentFadeExitAnimation = 16843498; // 0x10102ea

    field public static final int fragmentOpenEnterAnimation = 16843493; // 0x10102e5

    field public static final int fragmentOpenExitAnimation = 16843494; // 0x10102e6

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int fragmentPattern;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int fragmentPrefix;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int fragmentPattern = 16844437; // 0x1010695

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int fragmentPrefix = 16844436; // 0x1010694

    field public static final int fragmentReenterTransition = 16843975; // 0x10104c7

    field public static final int fragmentReturnTransition = 16843973; // 0x10104c5

    field public static final int fragmentSharedElementEnterTransition = 16843972; // 0x10104c4

    field public static final int fragmentSharedElementReturnTransition = 16843974; // 0x10104c6

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int fragmentSuffix;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int fragmentSuffix = 16844439; // 0x1010697

    field public static final int freezesText = 16843116; // 0x101016c

    field public static final int fromAlpha = 16843210; // 0x10101ca

    field public static final int fromDegrees = 16843187; // 0x10101b3
@@ -1345,15 +1345,15 @@ package android { 
    field public static final int propertyYName = 16843893; // 0x1010475

    field public static final int protectionLevel = 16842761; // 0x1010009

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

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int query;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int query = 16844431; // 0x101068f

    field public static final int queryActionMsg = 16843227; // 0x10101db

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int queryAdvancedPattern;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int queryAdvancedPattern = 16844434; // 0x1010692

    field public static final int queryAfterZeroResults = 16843394; // 0x1010282

    field public static final int queryBackground = 16843911; // 0x1010487

    field public static final int queryHint = 16843608; // 0x1010358

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int queryPattern;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int queryPrefix;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int querySuffix;

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int queryPattern = 16844433; // 0x1010691

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int queryPrefix = 16844432; // 0x1010690

    field @FlaggedApi("android.content.pm.relative_reference_intent_filters") public static final int querySuffix = 16844435; // 0x1010693

    field public static final int quickContactBadgeStyleSmallWindowLarge = 16843443; // 0x10102b3

    field public static final int quickContactBadgeStyleSmallWindowMedium = 16843442; // 0x10102b2

    field public static final int quickContactBadgeStyleSmallWindowSmall = 16843441; // 0x10102b1
@@ -1382,7 +1382,7 @@ package android { 
    field public static final int reqTouchScreen = 16843303; // 0x1010227

    field public static final int requestLegacyExternalStorage = 16844291; // 0x1010603

    field public static final int requestRawExternalStorageAccess = 16844357; // 0x1010645

    field @FlaggedApi("android.security.content_uri_permission_apis") public static final int requireContentUriPermissionFromCaller;

    field @FlaggedApi("android.security.content_uri_permission_apis") public static final int requireContentUriPermissionFromCaller = 16844443; // 0x101069b

    field public static final int requireDeviceScreenOn = 16844317; // 0x101061d

    field public static final int requireDeviceUnlock = 16843756; // 0x10103ec

    field public static final int required = 16843406; // 0x101028e
@@ -1494,12 +1494,12 @@ package android { 
    field @Deprecated public static final int sharedUserLabel = 16843361; // 0x1010261

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

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

    field @FlaggedApi("com.android.text.flags.use_bounds_for_width") public static final int shiftDrawingOffsetForStartOverhang;

    field @FlaggedApi("com.android.text.flags.use_bounds_for_width") public static final int shiftDrawingOffsetForStartOverhang = 16844450; // 0x10106a2

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

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

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

    field public static final int shortcutShortLabel = 16844073; // 0x1010529

    field @FlaggedApi("android.nfc.nfc_observe_mode") public static final int shouldDefaultToObserveMode;

    field @FlaggedApi("android.nfc.nfc_observe_mode") public static final int shouldDefaultToObserveMode = 16844448; // 0x10106a0

    field public static final int shouldDisableView = 16843246; // 0x10101ee

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

    field public static final int showAsAction = 16843481; // 0x10102d9
@@ -1610,7 +1610,7 @@ package android { 
    field public static final int supportedTypes = 16844369; // 0x1010651

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

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

    field @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public static final int supportsConnectionlessStylusHandwriting;

    field @FlaggedApi("android.view.inputmethod.connectionless_handwriting") public static final int supportsConnectionlessStylusHandwriting = 16844447; // 0x101069f

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

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

    field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1
@@ -1631,7 +1631,7 @@ package android { 
    field public static final int switchTextOff = 16843628; // 0x101036c

    field public static final int switchTextOn = 16843627; // 0x101036b

    field public static final int syncable = 16842777; // 0x1010019

    field @FlaggedApi("android.multiuser.enable_system_user_only_for_services_and_providers") public static final int systemUserOnly;

    field @FlaggedApi("android.multiuser.enable_system_user_only_for_services_and_providers") public static final int systemUserOnly = 16844429; // 0x101068d

    field public static final int tabStripEnabled = 16843453; // 0x10102bd

    field public static final int tabStripLeft = 16843451; // 0x10102bb

    field public static final int tabStripRight = 16843452; // 0x10102bc
@@ -1808,12 +1808,12 @@ package android { 
    field public static final int updatePeriodMillis = 16843344; // 0x1010250

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

    field public static final int useAppZygote = 16844183; // 0x1010597

    field @FlaggedApi("com.android.text.flags.use_bounds_for_width") public static final int useBoundsForWidth;

    field @FlaggedApi("com.android.text.flags.use_bounds_for_width") public static final int useBoundsForWidth = 16844440; // 0x1010698

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

    field public static final int useEmbeddedDex = 16844190; // 0x101059e

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

    field public static final int useLevel = 16843167; // 0x101019f

    field @FlaggedApi("com.android.text.flags.fix_line_height_for_locale") public static final int useLocalePreferredLineHeightForMinimum;

    field @FlaggedApi("com.android.text.flags.fix_line_height_for_locale") public static final int useLocalePreferredLineHeightForMinimum = 16844445; // 0x101069d

    field public static final int userVisible = 16843409; // 0x1010291

    field public static final int usesCleartextTraffic = 16844012; // 0x10104ec

    field public static final int usesPermissionFlags = 16844356; // 0x1010644
@@ -1892,7 +1892,7 @@ package android { 
    field public static final int windowFullscreen = 16843277; // 0x101020d

    field public static final int windowHideAnimation = 16842935; // 0x10100b7

    field public static final int windowIsFloating = 16842839; // 0x1010057

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final int windowIsFrameRatePowerSavingsBalanced;

    field @FlaggedApi("android.view.flags.toolkit_set_frame_rate_read_only") public static final int windowIsFrameRatePowerSavingsBalanced = 16844451; // 0x10106a3

    field public static final int windowIsTranslucent = 16842840; // 0x1010058

    field public static final int windowLayoutAffinity = 16844313; // 0x1010619

    field public static final int windowLayoutInDisplayCutoutMode = 16844166; // 0x1010586
@@ -1903,7 +1903,7 @@ package android { 
    field public static final int windowNoDisplay = 16843294; // 0x101021e

    field public static final int windowNoMoveAnimation = 16844421; // 0x1010685

    field public static final int windowNoTitle = 16842838; // 0x1010056

    field @FlaggedApi("com.android.window.flags.enforce_edge_to_edge") public static final int windowOptOutEdgeToEdgeEnforcement;

    field @FlaggedApi("com.android.window.flags.enforce_edge_to_edge") public static final int windowOptOutEdgeToEdgeEnforcement = 16844442; // 0x101069a

    field @Deprecated public static final int windowOverscan = 16843727; // 0x10103cf

    field public static final int windowReenterTransition = 16843951; // 0x10104af

    field public static final int windowReturnTransition = 16843950; // 0x10104ae
@@ -2015,19 +2015,19 @@ package android { 
    field public static final int system_control_highlight_light = 17170558; // 0x106007e

    field public static final int system_control_normal_dark = 17170600; // 0x10600a8

    field public static final int system_control_normal_light = 17170557; // 0x106007d

    field public static final int system_error_0;

    field public static final int system_error_10;

    field public static final int system_error_100;

    field public static final int system_error_1000;

    field public static final int system_error_200;

    field public static final int system_error_300;

    field public static final int system_error_400;

    field public static final int system_error_50;

    field public static final int system_error_500;

    field public static final int system_error_600;

    field public static final int system_error_700;

    field public static final int system_error_800;

    field public static final int system_error_900;

    field public static final int system_error_0 = 17170629; // 0x10600c5

    field public static final int system_error_10 = 17170630; // 0x10600c6

    field public static final int system_error_100 = 17170632; // 0x10600c8

    field public static final int system_error_1000 = 17170641; // 0x10600d1

    field public static final int system_error_200 = 17170633; // 0x10600c9

    field public static final int system_error_300 = 17170634; // 0x10600ca

    field public static final int system_error_400 = 17170635; // 0x10600cb

    field public static final int system_error_50 = 17170631; // 0x10600c7

    field public static final int system_error_500 = 17170636; // 0x10600cc

    field public static final int system_error_600 = 17170637; // 0x10600cd

    field public static final int system_error_700 = 17170638; // 0x10600ce

    field public static final int system_error_800 = 17170639; // 0x10600cf

    field public static final int system_error_900 = 17170640; // 0x10600d0

    field public static final int system_error_container_dark = 17170597; // 0x10600a5

    field public static final int system_error_container_light = 17170554; // 0x106007a

    field public static final int system_error_dark = 17170595; // 0x10600a3
@@ -2077,7 +2077,7 @@ package android { 
    field public static final int system_on_secondary_fixed_variant = 17170619; // 0x10600bb

    field public static final int system_on_secondary_light = 17170533; // 0x1060065

    field public static final int system_on_surface_dark = 17170584; // 0x1060098

    field public static final int system_on_surface_disabled;

    field public static final int system_on_surface_disabled = 17170627; // 0x10600c3

    field public static final int system_on_surface_light = 17170541; // 0x106006d

    field public static final int system_on_surface_variant_dark = 17170593; // 0x10600a1

    field public static final int system_on_surface_variant_light = 17170550; // 0x1060076
@@ -2088,7 +2088,7 @@ package android { 
    field public static final int system_on_tertiary_fixed_variant = 17170623; // 0x10600bf

    field public static final int system_on_tertiary_light = 17170537; // 0x1060069

    field public static final int system_outline_dark = 17170594; // 0x10600a2

    field public static final int system_outline_disabled;

    field public static final int system_outline_disabled = 17170628; // 0x10600c4

    field public static final int system_outline_light = 17170551; // 0x1060077

    field public static final int system_outline_variant_dark = 17170625; // 0x10600c1

    field public static final int system_outline_variant_light = 17170624; // 0x10600c0
@@ -2129,7 +2129,7 @@ package android { 
    field public static final int system_surface_dark = 17170583; // 0x1060097

    field public static final int system_surface_dim_dark = 17170591; // 0x106009f

    field public static final int system_surface_dim_light = 17170548; // 0x1060074

    field public static final int system_surface_disabled;

    field public static final int system_surface_disabled = 17170626; // 0x10600c2

    field public static final int system_surface_light = 17170540; // 0x106006c

    field public static final int system_surface_variant_dark = 17170592; // 0x10600a0

    field public static final int system_surface_variant_light = 17170549; // 0x1060075

core/api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -437,10 +437,10 @@ package android { 














  public static final class R.attr {















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













    field @FlaggedApi("android.content.res.manifest_flagging") public static final int featureFlag;













    field @FlaggedApi("android.content.res.manifest_flagging") public static final int featureFlag = 16844428; // 0x101068c















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















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













    field @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") public static final int isVirtualDeviceOnly;













    field @FlaggedApi("android.companion.virtual.flags.vdm_custom_ime") public static final int isVirtualDeviceOnly = 16844425; // 0x1010689















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















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















    field public static final int playHomeTransitionSound = 16844358; // 0x1010646










@@ -492,9 +492,9 @@ package android {













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















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















    field public static final int config_defaultNotes = 17039429; // 0x1040045













    field @FlaggedApi("android.permission.flags.retail_demo_role_enabled") public static final int config_defaultRetailDemo;













    field @FlaggedApi("android.permission.flags.retail_demo_role_enabled") public static final int config_defaultRetailDemo = 17039432; // 0x1040048















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













    field @FlaggedApi("android.permission.flags.wallet_role_enabled") public static final int config_defaultWallet;













    field @FlaggedApi("android.permission.flags.wallet_role_enabled") public static final int config_defaultWallet = 17039433; // 0x1040049















    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

























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



+181
−0


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+19
−96


























File changed.
Preview size limit exceeded, changes collapsed.