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

Commit c9eb2c47 authored by Zach Kuznia's avatar Zach Kuznia Committed by android-build-merger
Browse files

Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev am: a5e6601a 

am: c8a35d64

* commit 'c8a35d64':
  Left and right margins for watch preferences.

Change-Id: Ib7888054d18139e7bbb1903242c16a69f25daf88
parents 94dd5439 c8a35d64

core/res/res/values-notround/dimens_micro.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,5 +15,6 @@ 
-->

<resources>

    <dimen name="dialog_padding_micro">8dp</dimen>

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

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

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

</resources>

core/res/res/values-round/dimens_micro.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,5 +15,6 @@ 
-->

<resources>

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

    <dimen name="list_item_padding_horizontal_micro">22dp</dimen>

    <dimen name="list_item_padding_left_micro">40dp</dimen>

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

</resources>

core/res/res/values/themes_micro.xml

+4 −4
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ 
        <item name="textAppearanceListItem">@style/TextAppearance.Micro.Subtitle</item>

        <item name="textAppearanceListItemSmall">@style/TextAppearance.Micro.Body1</item>

        <item name="textAppearanceListItemSecondary">@style/TextAppearance.Micro.Body2</item>

        <item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_horizontal_micro</item>

        <item name="listPreferredItemPaddingRight">@dimen/list_item_padding_horizontal_micro</item>

        <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_horizontal_micro</item>

        <item name="listPreferredItemPaddingEnd">@dimen/list_item_padding_horizontal_micro</item>

        <item name="listPreferredItemPaddingLeft">@dimen/list_item_padding_left_micro</item>

        <item name="listPreferredItemPaddingRight">@dimen/list_item_padding_right_micro</item>

        <item name="listPreferredItemPaddingStart">@dimen/list_item_padding_left_micro</item>

        <item name="listPreferredItemPaddingEnd">@dimen/list_item_padding_right_micro</item>



        <!-- Dialog styling -->

        <item name="buttonBarStyle">@style/Widget.Micro.ButtonBar</item>