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

Commit 077105ba authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev

parents 4f721f10 fa668cc9

core/res/res/layout-port/keyguard_widget_pager.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    android:paddingLeft="25dp"

    android:paddingRight="25dp"

    android:paddingTop="25dp"

    android:paddingBottom="64dp"

    android:paddingBottom="@dimen/kg_widget_pager_bottom_padding"

    android:clipChildren="false"

    android:clipToPadding="false"

    androidprv:pageSpacing="10dp">

core/res/res/values-land/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -50,4 +50,10 @@ 
    <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) -->

    <dimen name="kg_secure_padding_height">0dp</dimen>



    <!-- Top padding for the widget pager -->

    <dimen name="kg_widget_pager_top_padding">0dp</dimen>



    <!-- Bottom padding for the widget pager -->

    <dimen name="kg_widget_pager_bottom_padding">0dp</dimen>



</resources>

core/res/res/values-sw600dp/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -98,10 +98,10 @@ 
    <dimen name="kg_widget_pager_horizontal_padding">24dp</dimen>



    <!-- Top padding for the widget pager -->

    <dimen name="kg_widget_pager_top_padding">24dp</dimen>

    <dimen name="kg_widget_pager_top_padding">0dp</dimen>



    <!-- Bottom padding for the widget pager -->

    <dimen name="kg_widget_pager_bottom_padding">16dp</dimen>

    <dimen name="kg_widget_pager_bottom_padding">0dp</dimen>



    <!-- Top margin for the runway lights. We add a negative margin in large

        devices to account for the widget pager padding -->

core/res/res/values-sw720dp/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -91,10 +91,10 @@ 
    <dimen name="kg_widget_pager_horizontal_padding">80dp</dimen>



    <!-- Top padding for the widget pager -->

    <dimen name="kg_widget_pager_top_padding">32dp</dimen>

    <dimen name="kg_widget_pager_top_padding">0dp</dimen>



    <!-- Bottom padding for the widget pager -->

    <dimen name="kg_widget_pager_bottom_padding">36dp</dimen>

    <dimen name="kg_widget_pager_bottom_padding">0dp</dimen>



    <!-- Top margin for the runway lights. We add a negative margin in large

        devices to account for the widget pager padding -->

core/res/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ 
    <dimen name="kg_widget_pager_top_padding">0dp</dimen>



    <!-- Bottom padding for the widget pager -->

    <dimen name="kg_widget_pager_bottom_padding">0dp</dimen>

    <dimen name="kg_widget_pager_bottom_padding">64dp</dimen>



    <!-- Top margin for the runway lights. We add a negative margin in large

        devices to account for the widget pager padding -->