aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-04-08 03:28:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-08 03:28:27 +0000
commit61319558de0dd271b50f9ac2422b153a0f964f69 (patch)
tree0fa7c43be2cd8de5267528663095edd5fdff014f /java
parent0d76807dee8c1940f0cf9e2f0455b30936411241 (diff)
parent1b1732be5b771ee0295bbe7a7cc034baba7ae503 (diff)
downloadlatinime-61319558de0dd271b50f9ac2422b153a0f964f69.tar.gz
latinime-61319558de0dd271b50f9ac2422b153a0f964f69.tar.xz
latinime-61319558de0dd271b50f9ac2422b153a0f964f69.zip
am 1b1732be: Merge "Use Quantum.Light theme for API 20 or later"
* commit '1b1732be5b771ee0295bbe7a7cc034baba7ae503': Use Quantum.Light theme for API 20 or later
Diffstat (limited to 'java')
-rw-r--r--java/res/values-v20/platform-theme.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/java/res/values-v20/platform-theme.xml b/java/res/values-v20/platform-theme.xml
index b8c1d9655..06062047b 100644
--- a/java/res/values-v20/platform-theme.xml
+++ b/java/res/values-v20/platform-theme.xml
@@ -21,9 +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">
- <!-- TODO: Use Theme.Quantum.Light once it is fixed.
<style name="platformActivityTheme" parent="@android:style/Theme.Quantum.Light" />
- -->
- <style name="platformActivityTheme" parent="@android:style/Theme.Quantum.Light.NoActionBar.Fullscreen" />
<style name="platformDialogTheme" parent="@android:style/Theme.Quantum.Light.Dialog" />
</resources>