summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAltaf-Mahdi <altaf.mahdi@gmail.com>2015-01-12 03:00:01 +0000
committerSteve Kondik <shade@chemlab.org>2015-01-25 08:47:21 +0000
commit227f0b755c5268a251589436ef8e0d34ab5a70ef (patch)
tree30e6ff15eb8d2e2c7ed8680635d042290711687e
parent4beced1661178b2cbc7b2ecc8e66db2f420b1974 (diff)
downloadandroid_packages_inputmethods_LatinIME-227f0b755c5268a251589436ef8e0d34ab5a70ef.tar.gz
android_packages_inputmethods_LatinIME-227f0b755c5268a251589436ef8e0d34ab5a70ef.tar.bz2
android_packages_inputmethods_LatinIME-227f0b755c5268a251589436ef8e0d34ab5a70ef.zip
LatinIME: fix action bar theme issue
Change-Id: Ibfe963b8bdc7049ee7864cc1c883ad06c880d9c3
-rw-r--r--java/AndroidManifest.xml2
-rw-r--r--java/res/values-v21/platform-theme.xml9
-rw-r--r--java/res/values/colors.xml5
3 files changed, 14 insertions, 2 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index a1ffe5a93..054c415a4 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -18,7 +18,7 @@
coreApp="true"
package="com.android.inputmethod.latin">
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="19" />
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
diff --git a/java/res/values-v21/platform-theme.xml b/java/res/values-v21/platform-theme.xml
index 2a54798b8..e007667e9 100644
--- a/java/res/values-v21/platform-theme.xml
+++ b/java/res/values-v21/platform-theme.xml
@@ -20,6 +20,13 @@
<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.Light" />
+ <style name="platformSettingsTheme" parent="android:Theme.Material.Light.DarkActionBar">
+ <!-- Used by the ActionBar -->
+ <item name="android:colorPrimary">@color/theme_primary</item>
+ <!-- Used by the StatusBar -->
+ <item name="android:colorPrimaryDark">@color/theme_primary_dark</item>
+ <!-- Used by controls, e.g. CheckBox, ProgressBar, etc. -->
+ <item name="android:colorAccent">@color/theme_accent</item>
+ </style>
<style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog" />
</resources>
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 5453d51c1..c438386bc 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -84,4 +84,9 @@
<color name="setup_welcome_video_margin_color">#FFCCCCCC</color>
<!-- Accent color for the notification. We need to match this to the OS build -->
<color name="notification_accent_color">#FF607D8B</color>
+
+ <!-- Palette colors referenced by top-level themes. -->
+ <color name="theme_primary">#ff263238</color>
+ <color name="theme_primary_dark">#ff21272b</color>
+ <color name="theme_accent">#ff009688</color>
</resources>