diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-21 18:28:17 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-21 18:28:17 +0000 |
| commit | f6785ea588799bf58140f2b315098e0b165f7665 (patch) | |
| tree | 61fbb1eabfa4e1ee7e120b8c586331a026b915af /java/res | |
| parent | a7783b288c018350e402abf53457bbb214e6e4d6 (diff) | |
| parent | de1ab73efbe3520059647924857a2d7b82e2fbe7 (diff) | |
| download | latinime-f6785ea588799bf58140f2b315098e0b165f7665.tar.gz latinime-f6785ea588799bf58140f2b315098e0b165f7665.tar.xz latinime-f6785ea588799bf58140f2b315098e0b165f7665.zip | |
am de1ab73e: Use Theme.DeviceDefault theme
* commit 'de1ab73efbe3520059647924857a2d7b82e2fbe7':
Use Theme.DeviceDefault theme
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-v21/platform-theme.xml (renamed from java/res/values-v20/platform-theme.xml) | 7 | ||||
| -rw-r--r-- | java/res/values/platform-theme.xml | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/java/res/values-v20/platform-theme.xml b/java/res/values-v21/platform-theme.xml index 52e7f3521..2a54798b8 100644 --- a/java/res/values-v20/platform-theme.xml +++ b/java/res/values-v21/platform-theme.xml @@ -18,9 +18,8 @@ */ --> -<!-- 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.Material.Light" /> - <style name="platformDialogTheme" parent="@android:style/Theme.Material.Light.Dialog" /> + <style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault.Light" /> + <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault.Light" /> + <style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog" /> </resources> diff --git a/java/res/values/platform-theme.xml b/java/res/values/platform-theme.xml index 8e131a2b0..2854ff72f 100644 --- a/java/res/values/platform-theme.xml +++ b/java/res/values/platform-theme.xml @@ -19,6 +19,7 @@ --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="platformActivityTheme" parent="@android:style/Theme.Holo" /> - <style name="platformDialogTheme" parent="@android:style/Theme.Holo.Dialog" /> + <style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault" /> + <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault" /> + <style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog" /> </resources> |