LatinIME: Fix settings and dialog themes
Drop the custom v21 theme, the default theme serves us well enough. Also
inherit from the default Settings theme.
Change-Id: Ibad18b2ff2bc5dea9e9470980dadf81f85270e54
diff --git a/java/res/values-v21/platform-theme.xml b/java/res/values-v21/platform-theme.xml
deleted file mode 100644
index 58763fb..0000000
--- a/java/res/values-v21/platform-theme.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault.Light" />
- <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
- <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 2854ff7..0eee05c 100644
--- a/java/res/values/platform-theme.xml
+++ b/java/res/values/platform-theme.xml
@@ -20,6 +20,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault" />
- <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault" />
+ <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
<style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog" />
</resources>