Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d841ee9c authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by Android (Google) Code Review
Browse files

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

parents ec9f4135 686de427

core/res/res/values-watch/config_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 
    <!-- Always overscan by default to ensure onApplyWindowInsets will always be called. -->

    <bool name="config_windowOverscanByDefault">true</bool>



    <!-- Enable windowSwipeToDismiss. -->

    <bool name="config_windowSwipeToDismiss">true</bool>



    <!-- Style the scrollbars accoridngly. -->

    <drawable name="config_scrollbarThumbVertical">@drawable/scrollbar_vertical_thumb</drawable>

    <drawable name="config_scrollbarTrackVertical">@drawable/scrollbar_vertical_track</drawable>

core/res/res/values/config_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ 
    <!-- True if windowOverscan should be on by default. -->

    <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. -->

    <bool name="config_preferenceFragmentClipToPadding">true</bool>

core/res/res/values/themes_material.xml

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ please see themes_device_defaults.xml. 
        <item name="windowSharedElementExitTransition">@transition/move</item>

        <item name="windowContentTransitions">false</item>

        <item name="windowActivityTransitions">true</item>

        <item name="windowSwipeToDismiss">@bool/config_windowSwipeToDismiss</item>



        <!-- Dialog attributes -->

        <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="windowContentTransitions">false</item>

        <item name="windowActivityTransitions">true</item>

        <item name="windowSwipeToDismiss">@bool/config_windowSwipeToDismiss</item>



        <!-- Dialog attributes -->

        <item name="dialogTheme">@style/ThemeOverlay.Material.Dialog</item>