diff options
author | Scott Kennedy <skennedy@google.com> | 2014-10-06 22:31:54 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 22:31:54 +0000 |
commit | 5c4d941d30f58c2ac94490feb0b37be90cbfd904 (patch) | |
tree | 98d555060bd38d9a741cbeeb26737037718a599c | |
parent | 589c0d7df806a1277faddc4909f3af119ec31c4d (diff) | |
parent | acb426abf42f61c87dcbbf47fe4f837ced64bf08 (diff) | |
download | android_frameworks_opt_datetimepicker-5c4d941d30f58c2ac94490feb0b37be90cbfd904.tar.gz android_frameworks_opt_datetimepicker-5c4d941d30f58c2ac94490feb0b37be90cbfd904.tar.bz2 android_frameworks_opt_datetimepicker-5c4d941d30f58c2ac94490feb0b37be90cbfd904.zip |
am acb426ab: Remove resource conflicts in datetimepicker
* commit 'acb426abf42f61c87dcbbf47fe4f837ced64bf08':
Remove resource conflicts in datetimepicker
-rw-r--r-- | res/values/styles.xml | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 2fa8c12..ff182d9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -16,23 +16,6 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- - Base application theme, dependent on API level. This theme is replaced - by AppBaseTheme from res/values-vXX/styles.xml on newer devices. - --> - <style name="AppBaseTheme" parent="android:Theme.Light"> - <!-- - Theme customizations available in newer API levels can go in - res/values-vXX/styles.xml, while customizations related to - backward-compatibility can go here. - --> - </style> - - <!-- Application theme. --> - <style name="AppTheme" parent="AppBaseTheme"> - <!-- All customizations that are NOT specific to a particular API-level can go here. --> - </style> - <style name="time_label"> <item name="android:textSize">@dimen/time_label_size</item> <item name="android:textColor">@color/numbers_text_color</item> @@ -46,4 +29,4 @@ </style> <style name="day_of_week_label_condensed" /> -</resources>
\ No newline at end of file +</resources> |