commit fa05aa0ff8db17765d485205d0a846ade6447fe8
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 16 23:38:31 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 16 23:38:31 2018 +0000
tree 426e093243a725acac274a218480600d60099626
parent 1147ae120527b2a7925c9dee960f5bf99f506469
parent 6392ab418b667963465819a38d838a85816dfdc0

Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev

core/res/res/values/config.xml

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index a353070..268bc9c 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3424,4 +3424,7 @@
     <!-- Whether or not swipe up gesture is enabled by default -->
     <bool name="config_swipe_up_gesture_default">false</bool>
 
+    <!-- Whether or not swipe up gesture's opt-in setting is available on this device -->
+    <bool name="config_swipe_up_gesture_setting_available">false</bool>
+
 </resources>

core/res/res/values/symbols.xml

diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index fb275ba..6d4bbe2 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3301,6 +3301,7 @@
   <java-symbol type="string" name="shortcut_restore_unknown_issue" />
 
   <java-symbol type="bool" name="config_swipe_up_gesture_default" />
+  <java-symbol type="bool" name="config_swipe_up_gesture_setting_available" />
 
   <!-- From media projection -->
   <java-symbol type="string" name="config_mediaProjectionPermissionDialogComponent" />