summaryrefslogtreecommitdiff
path: root/core/api
diff options
context:
space:
mode:
authorYurii Zubrytskyi <zyy@google.com>2021-10-21 01:37:23 -0700
committerYurii Zubrytskyi <zyy@google.com>2021-10-21 18:39:53 +0000
commite9e1d94c4af4808bb779629e6add3ae35f4ad507 (patch)
tree56cd81cc396538234eed6621441388d7b2eb5580 /core/api
parent834f4e6c928d5e74202fc4b2e11510bcf4f79d8f (diff)
[res] Finalize resources in SC-v2 RESTRICT AUTOMERGE
+ modify the finalization script to support new mode - staging-public-group + support removed items Bug: 203782582 Test: manual, aapt2 dump on the generated resources Change-Id: I507f85737d0ba5bf074dd8d98633087ff33c8382
Diffstat (limited to 'core/api')
-rw-r--r--core/api/current.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index e015169cf69a..cf2faae90971 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -1298,7 +1298,7 @@ package android {
field public static final int shortcutLongLabel = 16844074; // 0x101052a
field public static final int shortcutShortLabel = 16844073; // 0x1010529
field public static final int shouldDisableView = 16843246; // 0x10101ee
- field public static final int shouldUseDefaultUnfoldTransition;
+ field public static final int shouldUseDefaultUnfoldTransition = 16844364; // 0x101064c
field public static final int showAsAction = 16843481; // 0x10102d9
field public static final int showDefault = 16843258; // 0x10101fa
field public static final int showDividers = 16843561; // 0x1010329
@@ -2014,9 +2014,9 @@ package android {
public static final class R.id {
ctor public R.id();
field public static final int accessibilityActionContextClick = 16908348; // 0x102003c
- field public static final int accessibilityActionDragCancel;
- field public static final int accessibilityActionDragDrop;
- field public static final int accessibilityActionDragStart;
+ field public static final int accessibilityActionDragCancel = 16908375; // 0x1020057
+ field public static final int accessibilityActionDragDrop = 16908374; // 0x1020056
+ field public static final int accessibilityActionDragStart = 16908373; // 0x1020055
field public static final int accessibilityActionHideTooltip = 16908357; // 0x1020045
field public static final int accessibilityActionImeEnter = 16908372; // 0x1020054
field public static final int accessibilityActionMoveWindow = 16908354; // 0x1020042