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

Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev

Browse Source 
am: 614c83d977

* commit '614c83d9777b68b304e0fac6ac19e39a4d49d016':
  Fix incorrect inheritance from TextAppearance to Widget.

Change-Id: Ifdce3f9fa8d3be08b7de6c5afb2d1a74b0437188
This commit is contained in:
Seigo Nonaka
2016-05-13 00:54:04 +00:00
committed by android-build-merger
parent 1624d76664 614c83d977
commit 04250248b9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/res/values/styles_holo.xml
View File

@@ -1172,7 +1172,8 @@ please see styles_device_defaults.xml.
<style name="Widget.Holo.Light.FastScroll" parent="Widget.Holo.FastScroll" />
<style name="Widget.Holo.SuggestionItem" parent="TextAppearance.Holo.Medium">
<style name="Widget.Holo.SuggestionItem">
<item name="textAppearance">@android:style/TextAppearance.Holo.Medium</item>
<item name="background">@color/white</item>
<item name="drawablePadding">8dip</item>
<item name="gravity">start|center_vertical</item>
@@ -1188,9 +1189,9 @@ please see styles_device_defaults.xml.
<item name="textColor">@color/black</item>
</style>
<style name="TextAppearance.Holo.SuggestionHighlight" parent="TextAppearance.SuggestionHighlight" />
<style name="TextAppearance.Holo.SuggestionHighlight" parent="@android:style/TextAppearance.SuggestionHighlight" />
<style name="Widget.Holo.SuggestionButton" parent="Widget.Holo.SuggestionItem">
<style name="Widget.Holo.SuggestionButton" parent="@android:style/Widget.Holo.SuggestionItem">
<item name="background">#E9E9E9</item>
<item name="textColor">@color/black</item>
</style>

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

@@ -1001,7 +1001,8 @@ please see styles_device_defaults.xml.
<item name="contentDescription">@string/media_route_button_content_description</item>
</style>
<style name="Widget.Material.SuggestionItem" parent="@android:style/TextAppearance.Material.Body1">
<style name="Widget.Material.SuggestionItem">
<item name="textAppearance">@android:style/TextAppearance.Material.Body1</item>
<item name="textColor">?attr/textColorSecondary</item>
<item name="drawablePadding">8dip</item>
<item name="gravity">start|center_vertical</item>
@@ -1016,11 +1017,12 @@ please see styles_device_defaults.xml.
<item name="textSize">14sp</item>
</style>
<style name="TextAppearance.Material.TextSuggestionHighlight" parent="Widget.Material.SuggestionItem">
<style name="TextAppearance.Material.TextSuggestionHighlight">
<item name="textColor">?attr/textColorPrimary</item>
</style>
<style name="Widget.Material.SuggestionButton" parent="@android:style/TextAppearance.Material.Button">
<style name="Widget.Material.SuggestionButton">
<item name="textAppearance">@android:style/TextAppearance.Material.Button</item>
<item name="textColor">?attr/colorAccent</item>
<item name="drawablePadding">8dip</item>
<item name="gravity">start|center_vertical</item>