diff options
| author | Scott Kennedy <skennedy@google.com> | 2014-10-07 22:24:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 22:24:08 +0000 |
| commit | a2e1535135bfc80bf2a4055fa465f3c875dd9edc (patch) | |
| tree | 9e6a0c9c61e30c0c7e4f3be04c38e82e3890c119 | |
| parent | 890abeee4b6cacc099deadcc3ab8dc20b6593498 (diff) | |
| parent | 5c4d941d30f58c2ac94490feb0b37be90cbfd904 (diff) | |
| download | android_frameworks_opt_datetimepicker-a2e1535135bfc80bf2a4055fa465f3c875dd9edc.tar.gz android_frameworks_opt_datetimepicker-a2e1535135bfc80bf2a4055fa465f3c875dd9edc.tar.bz2 android_frameworks_opt_datetimepicker-a2e1535135bfc80bf2a4055fa465f3c875dd9edc.zip | |
am 5c4d941d: am acb426ab: Remove resource conflicts in datetimepicker
* commit '5c4d941d30f58c2ac94490feb0b37be90cbfd904':
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> |