diff options
| author | Adam Powell <adamp@google.com> | 2010-12-14 16:11:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-14 16:11:13 -0800 |
| commit | 6b8653c6a366de45a3a75fbd3898a6ae67756008 (patch) | |
| tree | 6c2a08ee690eed3a2751e5bad691ba1e8560a571 /core | |
| parent | 31ade6b45a108d91b5769a3830a650e51e6008b0 (diff) | |
| parent | 29a2f3b04f3e762e2024476039a5d437f52d865a (diff) | |
| download | frameworks_base-6b8653c6a366de45a3a75fbd3898a6ae67756008.zip frameworks_base-6b8653c6a366de45a3a75fbd3898a6ae67756008.tar.gz frameworks_base-6b8653c6a366de45a3a75fbd3898a6ae67756008.tar.bz2 | |
Merge "Add color selectors for transparent cache color hint when accelerated"
Diffstat (limited to 'core')
3 files changed, 44 insertions, 2 deletions
diff --git a/core/res/res/drawable/background_cache_hint_selector_holo_dark.xml b/core/res/res/drawable/background_cache_hint_selector_holo_dark.xml new file mode 100644 index 0000000..b18c5b7 --- /dev/null +++ b/core/res/res/drawable/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/drawable/background_cache_hint_selector_holo_light.xml b/core/res/res/drawable/background_cache_hint_selector_holo_light.xml new file mode 100644 index 0000000..9d80944 --- /dev/null +++ b/core/res/res/drawable/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/values/themes.xml b/core/res/res/values/themes.xml index d34c6c1..f0f101e 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -690,7 +690,7 @@ <item name="colorForeground">@android:color/bright_foreground_holo_dark</item> <item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_dark</item> <item name="colorBackground">@android:color/background_holo_dark</item> - <item name="colorBackgroundCacheHint">?android:attr/colorBackground</item> + <item name="colorBackgroundCacheHint">@android:drawable/background_cache_hint_selector_holo_dark</item> <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> @@ -952,7 +952,7 @@ <item name="colorForeground">@android:color/bright_foreground_holo_light</item> <item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_light</item> <item name="colorBackground">@android:color/background_holo_light</item> - <item name="colorBackgroundCacheHint">?android:attr/colorBackground</item> + <item name="colorBackgroundCacheHint">@android:drawable/background_cache_hint_selector_holo_light</item> <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> |