diff options
| author | 2020-06-22 10:13:18 +0000 | |
|---|---|---|
| committer | 2020-06-22 10:13:18 +0000 | |
| commit | ff8d81faeeec531306e783448b47b1b38e8c0b54 (patch) | |
| tree | 813221b224ae4fb20af05cbb7397840add101216 | |
| parent | 833a388c52842687803cd1e10b408957a2c44bbd (diff) | |
| parent | 60d5549eda89d7b337a1e72cc5e4257b31725ee1 (diff) | |
Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931079
Change-Id: I653bb2626afac50265e75cc9c0bb22ad27069698
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index fc82bc788ac7..5bae37041edd 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 } diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 2869021a8a72..e2fbbf46608f 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -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> |