Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable swipe to dismiss for watch devices." into cw-f-dev

Browse Source
This commit is contained in:
Erik Wolsheimer
2016-11-18 19:17:53 +00:00
committed by Android (Google) Code Review
parent ec9f41356c 686de42711
commit d841ee9c81
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values-watch/config_material.xml
View File

@@ -30,6 +30,9 @@
<!-- Always overscan by default to ensure onApplyWindowInsets will always be called. --> <!-- Always overscan by default to ensure onApplyWindowInsets will always be called. -->
<bool name="config_windowOverscanByDefault">true</bool> <bool name="config_windowOverscanByDefault">true</bool>
<!-- Enable windowSwipeToDismiss. -->
<bool name="config_windowSwipeToDismiss">true</bool>
<!-- Style the scrollbars accoridngly. --> <!-- Style the scrollbars accoridngly. -->
<drawable name="config_scrollbarThumbVertical">@drawable/scrollbar_vertical_thumb</drawable> <drawable name="config_scrollbarThumbVertical">@drawable/scrollbar_vertical_thumb</drawable>
<drawable name="config_scrollbarTrackVertical">@drawable/scrollbar_vertical_track</drawable> <drawable name="config_scrollbarTrackVertical">@drawable/scrollbar_vertical_track</drawable>

3
core/res/res/values/config_material.xml
View File

@@ -32,6 +32,9 @@
<!-- True if windowOverscan should be on by default. --> <!-- True if windowOverscan should be on by default. -->
<bool name="config_windowOverscanByDefault">false</bool> <bool name="config_windowOverscanByDefault">false</bool>
<!-- True if windowSwipeToDismiss should be on by default. -->
<bool name="config_windowSwipeToDismiss">false</bool>
<!-- True if preference fragment should clip to padding. --> <!-- True if preference fragment should clip to padding. -->
<bool name="config_preferenceFragmentClipToPadding">true</bool> <bool name="config_preferenceFragmentClipToPadding">true</bool>

2
core/res/res/values/themes_material.xml
View File

@@ -175,6 +175,7 @@ please see themes_device_defaults.xml.
<item name="windowSharedElementExitTransition">@transition/move</item> <item name="windowSharedElementExitTransition">@transition/move</item>
<item name="windowContentTransitions">false</item> <item name="windowContentTransitions">false</item>
<item name="windowActivityTransitions">true</item> <item name="windowActivityTransitions">true</item>
<item name="windowSwipeToDismiss">@bool/config_windowSwipeToDismiss</item>
<!-- Dialog attributes --> <!-- Dialog attributes -->
<item name="dialogTheme">@style/ThemeOverlay.Material.Dialog</item> <item name="dialogTheme">@style/ThemeOverlay.Material.Dialog</item>
@@ -536,6 +537,7 @@ please see themes_device_defaults.xml.
<item name="windowSharedElementExitTransition">@transition/move</item> <item name="windowSharedElementExitTransition">@transition/move</item>
<item name="windowContentTransitions">false</item> <item name="windowContentTransitions">false</item>
<item name="windowActivityTransitions">true</item> <item name="windowActivityTransitions">true</item>
<item name="windowSwipeToDismiss">@bool/config_windowSwipeToDismiss</item>
<!-- Dialog attributes --> <!-- Dialog attributes -->
<item name="dialogTheme">@style/ThemeOverlay.Material.Dialog</item> <item name="dialogTheme">@style/ThemeOverlay.Material.Dialog</item>