summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Victoria Lestari <valestari@google.com> 2021-03-08 16:28:19 +0000
committer Victoria Lestari <valestari@google.com> 2021-03-08 17:05:35 +0000
commit6d9979b6710edcd21b8c9b732a0862e65479f65e (patch)
tree720f6ab5da23f6b031c1b81b09a3fdbc56255b3c
parentf41a01c8d21cee8912fd6e0b181d8ba86987dff4 (diff)
Update attrs.xml and public.xml to allow a recognition service to be selected as default
Bug: 175429607 Tested: n/a Change-Id: I35eeda1abdec91ebc756cc507ebfd69081f10a0c
-rw-r--r--core/api/current.txt1
-rw-r--r--core/res/res/values/attrs.xml3
-rw-r--r--core/res/res/values/public.xml1
3 files changed, 5 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 57e256142eb0..05d7c231824a 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -1259,6 +1259,7 @@ package android {
field public static final int segmentedButtonStyle = 16843568; // 0x1010330
field public static final int selectAllOnFocus = 16843102; // 0x101015e
field public static final int selectable = 16843238; // 0x10101e6
+ field public static final int selectableAsDefault = 16844352; // 0x1010640
field public static final int selectableItemBackground = 16843534; // 0x101030e
field public static final int selectableItemBackgroundBorderless = 16843868; // 0x101045c
field @Deprecated public static final int selectedDateVerticalBar = 16843591; // 0x1010347
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index efc8fe9aafa2..05d29c2685f4 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -8633,6 +8633,9 @@
Described here are the attributes that can be included in that tag. -->
<declare-styleable name="RecognitionService">
<attr name="settingsActivity" />
+ <!-- Flag indicating whether a recognition service can be selected as default. The default
+ value of this flag is true. -->
+ <attr name="selectableAsDefault" format="boolean" />
</declare-styleable>
<!-- Use <code>voice-interaction-service</code> as the root tag of the XML resource that
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 7702ee437c43..14091738dbee 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3086,6 +3086,7 @@
<public name="hand_secondTintMode"/>
<public name="dataExtractionRules"/>
<public name="passwordsActivity"/>
+ <public name="selectableAsDefault"/>
</public-group>
<public-group type="drawable" first-id="0x010800b5">