summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Renouf <mrenouf@google.com> 2016-11-22 17:48:59 -0500
committer Mark Renouf <mrenouf@google.com> 2016-11-23 12:51:07 -0500
commit5514d77e7da9fe639d5f034eb37d3a7e7befa066 (patch)
tree1f1a1cd345e9d330ec9dcdef7854ae47baa29797
parent466bb400bbc7a249f6598d8dc24ac685a43df74d (diff)
Disables swipe-to-dismiss windows for input methods on Wear
BUG: 33086263 Change-Id: I77ed17602cee2cf08f5265a60a1d7654e6e23960
-rw-r--r--core/res/res/values-watch/themes_device_defaults.xml1
-rw-r--r--core/res/res/values-watch/themes_material.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/res/res/values-watch/themes_device_defaults.xml b/core/res/res/values-watch/themes_device_defaults.xml
index fbe780db6fae..4d210f6e2f9f 100644
--- a/core/res/res/values-watch/themes_device_defaults.xml
+++ b/core/res/res/values-watch/themes_device_defaults.xml
@@ -114,6 +114,7 @@ a similar way.
<item name="windowAnimationStyle">@style/Animation.InputMethod</item>
<item name="imeFullscreenBackground">?colorBackground</item>
<item name="imeExtractEnterAnimation">@anim/input_method_extract_enter</item>
+ <item name="windowSwipeToDismiss">false</item>
</style>
<!-- DeviceDefault theme for dialog windows and activities. In contrast to Material, the
diff --git a/core/res/res/values-watch/themes_material.xml b/core/res/res/values-watch/themes_material.xml
index 84bc25f26db4..0cf398b11085 100644
--- a/core/res/res/values-watch/themes_material.xml
+++ b/core/res/res/values-watch/themes_material.xml
@@ -37,6 +37,7 @@ please see styles_device_defaults.xml.
<item name="windowAnimationStyle">@style/Animation.InputMethod</item>
<item name="imeFullscreenBackground">?colorBackground</item>
<item name="imeExtractEnterAnimation">@anim/input_method_extract_enter</item>
+ <item name="windowSwipeToDismiss">false</item>
</style>
<!-- Override behaviour to set the theme colours for dialogs, keep them the same. -->