summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Gus Prevas <kprevas@google.com> 2016-03-02 18:28:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-03-02 18:28:28 +0000
commit27d68bb2df0165149f81fc491d66aa55e33b9a13 (patch)
tree3890c6cc43953ec17858cb43b82557fa67818281
parente3f400de602d257a921ceb5e36c915a6ac3e79bf (diff)
parenteb9f0f847bf9320cd43e42780f98cd357bf67a6b (diff)
Merge "Removes swipe-to-dismiss from Wear window styles." into nyc-dev
-rw-r--r--core/res/res/values/themes_micro.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml
index 8bf635e68cf9..478d66c767c0 100644
--- a/core/res/res/values/themes_micro.xml
+++ b/core/res/res/values/themes_micro.xml
@@ -24,7 +24,6 @@
<item name="windowBackground">@color/black</item>
<item name="windowContentOverlay">@null</item>
<item name="windowIsFloating">false</item>
- <item name="windowSwipeToDismiss">true</item>
<!-- Required to force windowInsets dispatch through application UI. -->
<item name="windowOverscan">true</item>
</style>
@@ -42,7 +41,6 @@
<item name="windowBackground">@color/white</item>
<item name="windowContentOverlay">@null</item>
<item name="windowIsFloating">false</item>
- <item name="windowSwipeToDismiss">true</item>
<!-- Required to force windowInsets dispatch through application UI. -->
<item name="windowOverscan">true</item>
</style>