diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 183dd1e579d..2d03c11227e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -966,6 +966,38 @@
- -1
+
+
+ - Floating over other apps
+ - Navigation bar
+
+
+
+
+
+
+ - 1
+
+ - 0
+
+
+
+
+ - Small
+ - Large
+ - Half Circle
+
+
+
+
+
+ - 0
+
+ - 1
+
+ - 2
+
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 107ca3897cd..4878825b1da 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5123,6 +5123,26 @@
Shortcut from lock screen
Allow feature shortcut to turn on from the lock screen. Hold both volume keys for a few seconds.
+
+ Accessibility button
+
+ Quickly access accessibility features
+
+ Quickly access accessibility features from any screen. \n\nTo get started, go to accessibility settings and select a feature. Tap on the shortcut and select the accessibility button.
+
+ Location
+
+ Size
+
+ Fade when not in use
+
+ Fades after a few seconds so it\u2019s easier to see your screen
+
+ Transparency when not in use
+
+ Transparent
+
+ Non-transparent
High contrast text
diff --git a/res/xml/accessibility_button_settings.xml b/res/xml/accessibility_button_settings.xml
new file mode 100644
index 00000000000..7bb534f3fbb
--- /dev/null
+++ b/res/xml/accessibility_button_settings.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/res/xml/accessibility_shortcuts_settings.xml b/res/xml/accessibility_shortcuts_settings.xml
index 35314e708bb..465f96d74df 100644
--- a/res/xml/accessibility_shortcuts_settings.xml
+++ b/res/xml/accessibility_shortcuts_settings.xml
@@ -21,6 +21,13 @@
android:persistent="false"
android:title="@string/accessibility_shortcuts_settings_title">
+
+
niks = AccessibilityButtonFragment.SEARCH_INDEX_DATA_PROVIDER
+ .getNonIndexableKeys(mContext);
+ final List keys =
+ XmlTestUtils.getKeysFromPreferenceXml(mContext,
+ R.xml.accessibility_button_settings);
+
+ assertThat(keys).containsAtLeastElementsIn(niks);
+ }
+}