summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2019-05-30 12:38:18 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-30 12:38:18 -0700
commit07917b9ee5b15dbdc06ca28c9e8638612bb3c92c (patch)
tree69d2991119e3b0380bab0cc8146bb3cff6808ed2
parent9992e088293082bdfe075234da24fcea38631f01 (diff)
parent6f24b88c71b83430625deb937b3ba4f3f954a633 (diff)
Merge "Adding config for SUW to determine whether to start Tips for gestural nav" into qt-dev
am: 6f24b88c71 Change-Id: I89e0c654d7d4ecf3f6d7a19c4fc811d408c44894
-rw-r--r--core/res/res/values/config.xml4
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 483ec376df06..6ef98cac0ca4 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3306,6 +3306,10 @@
(which normally prevents seamless rotation). -->
<bool name="config_allowSeamlessRotationDespiteNavBarMoving">false</bool>
+ <!-- Controls whether hints for gestural navigation are shown when the device is setup.
+ This should only be set when the device has gestural navigation enabled by default. -->
+ <bool name="config_showGesturalNavigationHints">false</bool>
+
<!-- Default insets [LEFT/RIGHTxTOP/BOTTOM] from the screen edge for picture-in-picture windows.
These values are in DPs and will be converted to pixel sizes internally. -->
<string translatable="false" name="config_defaultPictureInPictureScreenEdgeInsets">16x16</string>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 7563a454b1da..cc76a0eabc45 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2876,6 +2876,7 @@
<java-symbol type="bool" name="config_allowSeamlessRotationDespiteNavBarMoving" />
<java-symbol type="dimen" name="config_backGestureInset" />
<java-symbol type="color" name="system_bar_background_semi_transparent" />
+ <java-symbol type="bool" name="config_showGesturalNavigationHints" />
<!-- EditText suggestion popup. -->
<java-symbol type="id" name="suggestionWindowContainer" />