diff options
author | Scott Kennedy <skennedy@google.com> | 2015-03-04 12:49:43 -0800 |
---|---|---|
committer | Scott Kennedy <skennedy@google.com> | 2015-03-04 12:51:33 -0800 |
commit | 25ec099d386ded408be9ee5ab736ce20b62c66ee (patch) | |
tree | 996de012b5f33cb7b75b78e59469612e79e1e6b7 | |
parent | 3e67291068416cab11c0614ac2a4b5462b65ef18 (diff) | |
download | android_frameworks_opt_colorpicker-25ec099d386ded408be9ee5ab736ce20b62c66ee.tar.gz android_frameworks_opt_colorpicker-25ec099d386ded408be9ee5ab736ce20b62c66ee.tar.bz2 android_frameworks_opt_colorpicker-25ec099d386ded408be9ee5ab736ce20b62c66ee.zip |
Remove unnecessary themes
These are named the same in a bunch of projects, are never used here,
and are causing conflicts.
Change-Id: I26d4e23f9c7f0cc5c1307e06e62c3e1e7504d9ed
-rw-r--r-- | res/values-v11/styles.xml | 26 | ||||
-rw-r--r-- | res/values-v14/styles.xml | 27 | ||||
-rw-r--r-- | res/values/styles.xml | 35 |
3 files changed, 0 insertions, 88 deletions
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml deleted file mode 100644 index 918c716..0000000 --- a/res/values-v11/styles.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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> - - <!-- - Base application theme for API 11+. This theme completely replaces - AppBaseTheme from res/values/styles.xml on API 11+ devices. - --> - <style name="AppBaseTheme" parent="android:Theme.Holo.Light"> - <!-- API 11 theme customizations can go here. --> - </style> - -</resources>
\ No newline at end of file diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml deleted file mode 100644 index a31cec1..0000000 --- a/res/values-v14/styles.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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> - - <!-- - Base application theme for API 14+. This theme completely replaces - AppBaseTheme from BOTH res/values/styles.xml and - res/values-v11/styles.xml on API 14+ devices. - --> - <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar"> - <!-- API 14 theme customizations can go here. --> - </style> - -</resources>
\ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml deleted file mode 100644 index 8fbc742..0000000 --- a/res/values/styles.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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> - - <!-- - 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> - -</resources>
\ No newline at end of file |