From ce6270f532f82885700556a58623757e82d90bfd Mon Sep 17 00:00:00 2001
From: Galia Peycheva <galinap@google.com>
Date: Fri, 19 Jun 2020 16:25:58 +0200
Subject: [PATCH] Make config_assistantOnTopOfDream a TestApi

Test: atest AssistantStackTests
Bug: 158117282
Change-Id: I154e8b7d3fbf842fa9f1bef82a59193550af5620
---
 api/test-current.txt           | 1 +
 core/res/res/values/public.xml | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/api/test-current.txt b/api/test-current.txt
index fc82bc788ac72..5bae37041edd9 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 2869021a8a72d..e2fbbf46608fb 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>