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

Merge "Update EditText break strategy for Theme.Micro." into nyc-mr1-dev

Browse Source 
am: e7f634f416

* commit 'e7f634f4164733ebf6872b31de8dcfe02885e3d4':
  Update EditText break strategy for Theme.Micro.

Change-Id: I8d6b567bad7c59ece17c8663bc496f3047da7ac1
This commit is contained in:
Michael Kwan
2016-05-25 21:58:13 +00:00
committed by android-build-merger
parent ec319efbd5 e7f634f416
commit 76501fed59
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/styles_micro.xml
View File

@@ -127,6 +127,10 @@
<item name="hyphenationFrequency">normal</item>
</style>
<style name="Widget.Micro.EditText" parent="Widget.Material.EditText">
<item name="android:breakStrategy">simple</item>
</style>
<style name="Widget.Micro.NumberPicker">
<item name="internalLayout">@layout/number_picker_with_selector_wheel_micro</item>
<item name="solidColor">@color/transparent</item>

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

@@ -19,6 +19,7 @@
<item name="alertDialogStyle">@style/AlertDialog.Micro</item>
<item name="dialogTheme">@style/Theme.Micro.Dialog</item>
<item name="textViewStyle">@style/Widget.Micro.TextView</item>
<item name="editTextStyle">@style/Widget.Micro.EditText</item>
<item name="numberPickerStyle">@style/Widget.Micro.NumberPicker</item>
<item name="windowAnimationStyle">@style/Animation.Micro.Activity</item>
<item name="windowBackground">@color/background_micro_dark</item>