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 am: c8a35d64c6

Browse Source 
am: c9eb2c47b1

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

Change-Id: I78b69b3d952370bfc845cd93c35cd16c5817f8f3
This commit is contained in:
Danny Epstein
2016-05-25 21:37:06 +00:00
committed by android-build-merger
parent 5bcd9cf1c5 c9eb2c47b1
commit 8305af34c5
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>