summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@google.com>2014-10-06 12:54:45 -0700
committerScott Kennedy <skennedy@google.com>2014-10-06 12:55:25 -0700
commitacb426abf42f61c87dcbbf47fe4f837ced64bf08 (patch)
tree98d555060bd38d9a741cbeeb26737037718a599c
parent48bf1debfe72dee562d95f796e4fff3fe78c0bd4 (diff)
downloadandroid_frameworks_opt_datetimepicker-acb426abf42f61c87dcbbf47fe4f837ced64bf08.tar.gz
android_frameworks_opt_datetimepicker-acb426abf42f61c87dcbbf47fe4f837ced64bf08.tar.bz2
android_frameworks_opt_datetimepicker-acb426abf42f61c87dcbbf47fe4f837ced64bf08.zip
Remove resource conflicts in datetimepicker
Removes some unnecessary resources which conflict with recurrencepicker From bakergo@ Change-Id: Iddab59e53d049eef7ad0efae7a5b4bbd6df5f993
-rw-r--r--res/values/styles.xml19
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>