diff options
| author | Alan Viverette <alanv@google.com> | 2014-03-25 17:58:50 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-03-26 12:33:48 -0700 |
| commit | 1cd4612cc04ee715a916de3c437fc52d76d166cb (patch) | |
| tree | 9ac244717091a290c8c06a3de80b4eeb8d97679b /core/res/res/color | |
| parent | 583080d87cbf08c253e79feafd6a1b74cf3cddc1 (diff) | |
| download | frameworks_base-1cd4612cc04ee715a916de3c437fc52d76d166cb.zip frameworks_base-1cd4612cc04ee715a916de3c437fc52d76d166cb.tar.gz frameworks_base-1cd4612cc04ee715a916de3c437fc52d76d166cb.tar.bz2 | |
Fix attribute extraction, use color attrs in Quantum drawables
Removes some unused entries in the Quantum themes and styles and
collapses identical styles since we don't have separate drawables
anymore. Adds some Quantum text appearances as styles.
BUG: 12368046
Change-Id: I9334feb87391cd54ad3b77b297d135de436e1417
Diffstat (limited to 'core/res/res/color')
4 files changed, 82 insertions, 0 deletions
diff --git a/core/res/res/color/background_cache_hint_selector_holo_dark.xml b/core/res/res/color/background_cache_hint_selector_holo_dark.xml new file mode 100644 index 0000000..b18c5b7 --- /dev/null +++ b/core/res/res/color/background_cache_hint_selector_holo_dark.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_accelerated="false" + android:color="@android:color/background_holo_dark" /> + <item android:color="@android:color/transparent" /> +</selector> diff --git a/core/res/res/color/background_cache_hint_selector_holo_light.xml b/core/res/res/color/background_cache_hint_selector_holo_light.xml new file mode 100644 index 0000000..9d80944 --- /dev/null +++ b/core/res/res/color/background_cache_hint_selector_holo_light.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_accelerated="false" + android:color="@android:color/background_holo_light" /> + <item android:color="@android:color/transparent" /> +</selector> diff --git a/core/res/res/color/background_cache_hint_selector_quantum_dark.xml b/core/res/res/color/background_cache_hint_selector_quantum_dark.xml new file mode 100644 index 0000000..ab66501 --- /dev/null +++ b/core/res/res/color/background_cache_hint_selector_quantum_dark.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_accelerated="false" android:color="@android:color/background_quantum_dark" /> + <item android:color="@android:color/transparent" /> +</selector> diff --git a/core/res/res/color/background_cache_hint_selector_quantum_light.xml b/core/res/res/color/background_cache_hint_selector_quantum_light.xml new file mode 100644 index 0000000..fb940a9 --- /dev/null +++ b/core/res/res/color/background_cache_hint_selector_quantum_light.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_accelerated="false" android:color="@android:color/background_quantum_light" /> + <item android:color="@android:color/transparent" /> +</selector> |