diff options
author | Will Haldean Brown <haldean@google.com> | 2014-03-06 16:14:44 -0800 |
---|---|---|
committer | Will Haldean Brown <haldean@google.com> | 2014-03-06 16:17:38 -0800 |
commit | 434901078f495de1ba4899b28d0871f35d40347c (patch) | |
tree | e392de1cebdcce7e9c9ae5986c3cb05c588033f4 /core/res/res/values/themes_micro.xml | |
parent | 03f0834a03ed8296f31341b6d7b530ea74bc0188 (diff) | |
download | frameworks_base-434901078f495de1ba4899b28d0871f35d40347c.zip frameworks_base-434901078f495de1ba4899b28d0871f35d40347c.tar.gz frameworks_base-434901078f495de1ba4899b28d0871f35d40347c.tar.bz2 |
Fix Theme.Micro to not request ActionBar.
This led to a crash for apps that use Theme.DeviceDefault, because it
requests both actionbar and swipe-to-dismiss.
Bug: 13348329
Change-Id: Iabc95600b19d842d02df4e92ab32327328f99be5
Diffstat (limited to 'core/res/res/values/themes_micro.xml')
-rw-r--r-- | core/res/res/values/themes_micro.xml | 3 |
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 e429f96..7c0b7bc 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> |