aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-06-06 22:53:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-06 22:53:09 +0000
commitc5bb86a0c2c6cea445e257e9e97b292fa215ab22 (patch)
tree34f1fea49cd1d19010c64d982daa0b56c835904c /java
parent1d66382d9d8f0ea4a092ddfdf2773c17145eb997 (diff)
parent7869b6515ebe0566cff8d1b2073febbeb7ffca41 (diff)
downloadlatinime-c5bb86a0c2c6cea445e257e9e97b292fa215ab22.tar.gz
latinime-c5bb86a0c2c6cea445e257e9e97b292fa215ab22.tar.xz
latinime-c5bb86a0c2c6cea445e257e9e97b292fa215ab22.zip
am 7869b651: Merge "Material theme"
* commit '7869b6515ebe0566cff8d1b2073febbeb7ffca41': Material theme
Diffstat (limited to 'java')
-rw-r--r--java/res/values-v20/platform-theme.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/res/values-v20/platform-theme.xml b/java/res/values-v20/platform-theme.xml
index 06062047b..52e7f3521 100644
--- a/java/res/values-v20/platform-theme.xml
+++ b/java/res/values-v20/platform-theme.xml
@@ -21,6 +21,6 @@
<!-- TODO: This file is temporarily placed under values-v20. -->
<!-- TODO: It might be moved under values-v21. -->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="platformActivityTheme" parent="@android:style/Theme.Quantum.Light" />
- <style name="platformDialogTheme" parent="@android:style/Theme.Quantum.Light.Dialog" />
+ <style name="platformActivityTheme" parent="@android:style/Theme.Material.Light" />
+ <style name="platformDialogTheme" parent="@android:style/Theme.Material.Light.Dialog" />
</resources>