Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda am: 991261951a am: 5b255ed02a

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

Change-Id: I23208a971b1423d4a61ec70e935b0df6498a62ba
This commit is contained in:
Galia Peycheva
2020-06-22 10:46:18 +00:00
committed by Automerger Merge Worker
parent d7c4151d61 5b255ed02a
commit 07ad38c1ca
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test-current.txt
View File

@@ -32,6 +32,7 @@ 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
}

4
core/res/res/values/public.xml
View File

@@ -3022,6 +3022,8 @@
<public type="id" name="accessibilitySystemActionTakeScreenshot" id="0x01020053" />
<public type="id" name="accessibilityActionImeEnter" id="0x01020054" />
<!-- @hide @TestApi -->
<public type="bool" name="config_assistantOnTopOfDream" id="0x01110005" />
<!-- ===============================================================
Resources added in version S of the platform
@@ -3054,7 +3056,7 @@
<!-- dimension definitions go here -->
</public-group>
<public-group type="bool" first-id="0x01110005">
<public-group type="bool" first-id="0x01110006">
<!-- boolean definitions go here -->
</public-group>