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

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

Browse Source 
am: c8a35d64c6

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

Change-Id: Ib7888054d18139e7bbb1903242c16a69f25daf88
This commit is contained in:
Zach Kuznia
2016-05-25 21:21:18 +00:00
committed by android-build-merger
parent 94dd543957 c8a35d64c6
commit c9eb2c47b1
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values-notround/dimens_micro.xml
View File

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

3
core/res/res/values-round/dimens_micro.xml
View File

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

8
core/res/res/values/themes_micro.xml
View File

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