summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Renouf <mrenouf@google.com> 2016-11-23 19:43:16 +0000
committer android-build-merger <android-build-merger@google.com> 2016-11-23 19:43:16 +0000
commit44b97824c9646b1b86d503a66f4ed67f36f8b918 (patch)
tree5a8798a5016688effeaaa32003704f425296dd98
parent9276b0adfbe1948af67443ce60a49b25cb0f2bfb (diff)
parent7e0facaac688a0cacda843e7d3ce5ff0dee82b62 (diff)
Disables swipe-to-dismiss windows for input methods on Wear am: 5514d77e7d am: 97a7d79d6b
am: 7e0facaac6 Change-Id: If6c7fd7831c1f57e55962d855c3f0cedfdd1e1af
-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. -->