Merge "Material theme"

main
Alan Viverette 2014-06-06 22:49:30 +00:00 committed by Android (Google) Code Review
commit 7869b6515e
1 changed files with 2 additions and 2 deletions

View File

@ -21,6 +21,6 @@
<!-- TODO: This file is temporarily placed under values-v20. --> <!-- TODO: This file is temporarily placed under values-v20. -->
<!-- TODO: It might be moved under values-v21. --> <!-- TODO: It might be moved under values-v21. -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="platformActivityTheme" parent="@android:style/Theme.Quantum.Light" /> <style name="platformActivityTheme" parent="@android:style/Theme.Material.Light" />
<style name="platformDialogTheme" parent="@android:style/Theme.Quantum.Light.Dialog" /> <style name="platformDialogTheme" parent="@android:style/Theme.Material.Light.Dialog" />
</resources> </resources>