summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Will Haldean Brown <haldean@google.com> 2014-03-07 01:03:19 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-07 01:03:19 +0000
commitd7b5caabfec09a617ebbdec3d566f0be061f516c (patch)
tree7f0f8a5587b7db3a924c8ee21a364aadc4bb4490
parentb28f87301fbb4f7db0b195c210af8006a321a030 (diff)
parentda9a956bd8ea05f7cfffd86a16d395e536960727 (diff)
am da9a956b: Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev
* commit 'da9a956bd8ea05f7cfffd86a16d395e536960727': Fix Theme.Micro to not request ActionBar.
-rw-r--r--core/res/res/values/themes_micro.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/res/values/themes_micro.xml b/core/res/res/values/themes_micro.xml
index e429f96928d6..7c0b7bc1103d 100644
--- a/core/res/res/values/themes_micro.xml
+++ b/core/res/res/values/themes_micro.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
<resources>
- <style name="Theme.Micro" parent="Theme.Holo">
+ <style name="Theme.Micro" parent="Theme.Holo.NoActionBar">
+ <item name="textViewStyle">@android:style/Widget.Micro.TextView</item>
<item name="numberPickerStyle">@android:style/Widget.Micro.NumberPicker</item>
<item name="windowAnimationStyle">@android:style/Animation.SwipeDismiss</item>
<item name="windowIsFloating">false</item>